From ce37081fa86c0b0ed9a93f566e496a5b19a07e40 Mon Sep 17 00:00:00 2001 From: Dave Kleikamp Date: Wed, 21 May 2008 10:45:16 -0500 Subject: [PATCH] --- yaml --- r: 101185 b: refs/heads/master c: 6536d2891ba2c4e837ba8478dc13bb173ed24a23 h: refs/heads/master i: 101183: f64d41842db71cd9d0fe98b8ddc06ad077a68baf v: v3 --- [refs] | 2 +- trunk/fs/jfs/super.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d861812bdba2..30d7e4266f6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2e03ca7485cac033a0667d9e45e28d32fdee9a5 +refs/heads/master: 6536d2891ba2c4e837ba8478dc13bb173ed24a23 diff --git a/trunk/fs/jfs/super.c b/trunk/fs/jfs/super.c index 50ea65451732..0288e6d7936a 100644 --- a/trunk/fs/jfs/super.c +++ b/trunk/fs/jfs/super.c @@ -499,7 +499,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent) inode = jfs_iget(sb, ROOT_I); if (IS_ERR(inode)) { ret = PTR_ERR(inode); - goto out_no_root; + goto out_no_rw; } sb->s_root = d_alloc_root(inode); if (!sb->s_root) @@ -521,9 +521,8 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent) return 0; out_no_root: - jfs_err("jfs_read_super: get root inode failed"); - if (inode) - iput(inode); + jfs_err("jfs_read_super: get root dentry failed"); + iput(inode); out_no_rw: rc = jfs_umount(sb);