Merge branch 'work.mount3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / fs / gfs2 / super.c

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index ffc77e5097cba316a7647d7c9982dc74b9fb587a..5fa1eec4fb4f51e607c01a04512885929917509d 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1392,13 +1392,13 @@ static struct inode *gfs2_alloc_inode(struct super_block *sb)
        struct gfs2_inode *ip;
 
        ip = kmem_cache_alloc(gfs2_inode_cachep, GFP_KERNEL);
-       if (ip) {
-               ip->i_flags = 0;
-               ip->i_gl = NULL;
-               memset(&ip->i_res, 0, sizeof(ip->i_res));
-               RB_CLEAR_NODE(&ip->i_res.rs_node);
-               ip->i_rahead = 0;
-       }
+       if (!ip)
+               return NULL;
+       ip->i_flags = 0;
+       ip->i_gl = NULL;
+       memset(&ip->i_res, 0, sizeof(ip->i_res));
+       RB_CLEAR_NODE(&ip->i_res.rs_node);
+       ip->i_rahead = 0;
        return &ip->i_inode;
 }