Branch HEAD

b=19725
i=adilger
i=girish

ext4_iget() returns an error code now instead of NULL.

diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c
index f24135d..dee551b 100644 (file)
--- a/lustre/lvfs/fsfilt_ext3.c
+++ b/lustre/lvfs/fsfilt_ext3.c
@@ -1692,6 +1692,9 @@ static inline struct inode *ext3_iget_inuse(struct super_block *sb,
         if (ext3_test_bit(index, bitmap_bh->b_data))
                 inode = iget(sb, ino);
 
+        if (IS_ERR(inode))
+               /* Newer kernels return an error instead of a NULL pointer */
+                inode = NULL;
         return inode;
 }