Branch b_release_1_8_1

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 6a1dcf1..8cd4128 100644 (file)
--- 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;
 }