From 87a9c77c0bb5b83e657825ca492268b411a4dc8d Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 12 Feb 2012 21:15:58 -0500 Subject: [PATCH] --- yaml --- r: 292324 b: refs/heads/master c: f56b0fbc6477e50303a503ee1453ed94e20f154a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/coda/inode.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 94bbfdea36ed..3115233751f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 064326c0773af8a0e8bb82d895cceaedc8a51b9e +refs/heads/master: f56b0fbc6477e50303a503ee1453ed94e20f154a diff --git a/trunk/fs/coda/inode.c b/trunk/fs/coda/inode.c index 5e2e1b3f068d..32dafc875c14 100644 --- a/trunk/fs/coda/inode.c +++ b/trunk/fs/coda/inode.c @@ -208,7 +208,6 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent) if (IS_ERR(root)) { error = PTR_ERR(root); printk("Failure of coda_cnode_make for root: error %d\n", error); - root = NULL; goto error; } @@ -216,15 +215,13 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent) root->i_ino, root->i_sb->s_id); sb->s_root = d_alloc_root(root); if (!sb->s_root) { + iput(root); error = -EINVAL; goto error; } return 0; error: - if (root) - iput(root); - mutex_lock(&vc->vc_mutex); bdi_destroy(&vc->bdi); vc->vc_sb = NULL;