From: johann <johann>
Date: Thu, 4 Jun 2009 07:35:31 +0000 (+0000)
Subject: Branch b1_8
X-Git-Tag: v1_8_2_01~1^2~349
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=1fb943bca28a8ba378978d21c078910113c793cc;p=fs%2Flustre-release.git

Branch b1_8
b=19725
i=adilger
i=girish

unlike ext3_iget(), ext4_iget() returns an error instead of a NULL pointer
---

diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c
index 35cacb6..4733d05 100644
--- a/lustre/lvfs/fsfilt_ext3.c
+++ b/lustre/lvfs/fsfilt_ext3.c
@@ -1721,6 +1721,9 @@ static inline struct inode *ext3_iget_inuse(struct super_block *sb,
 #else
                 inode = ext3_iget(sb, ino);
 #endif
+        if (IS_ERR(inode))
+	        /* Newer kernels return an error instead of a NULL pointer */
+                inode = NULL;
         return inode;
 }