diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 21:46:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 21:46:36 -0800 |
| commit | 5cd9599bba428762025db6027764f1c59d0b1e1b (patch) | |
| tree | cb59ea13f6e6de4350ca38338bf9633e89f8418a /fs/coda/inode.c | |
| parent | e343a895a9f342f239c5e3c5ffc6c0b1707e6244 (diff) | |
| parent | d668dc56631da067540b2494d2a1f29ff7b5f15a (diff) | |
| download | op-kernel-dev-5cd9599bba428762025db6027764f1c59d0b1e1b.zip op-kernel-dev-5cd9599bba428762025db6027764f1c59d0b1e1b.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
autofs4: deal with autofs4_write/autofs4_write races
autofs4: catatonic_mode vs. notify_daemon race
autofs4: autofs4_wait() vs. autofs4_catatonic_mode() race
hfsplus: creation of hidden dir on mount can fail
block_dev: Suppress bdev_cache_init() kmemleak warninig
fix shrink_dcache_parent() livelock
coda: switch coda_cnode_make() to sane API as well, clean coda_lookup()
coda: deal correctly with allocation failure from coda_cnode_makectl()
securityfs: fix object creation races
Diffstat (limited to 'fs/coda/inode.c')
| -rw-r--r-- | fs/coda/inode.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/coda/inode.c b/fs/coda/inode.c index 1c08a8c..5e2e1b3 100644 --- a/fs/coda/inode.c +++ b/fs/coda/inode.c @@ -204,10 +204,12 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent) printk("coda_read_super: rootfid is %s\n", coda_f2s(&fid)); /* make root inode */ - error = coda_cnode_make(&root, &fid, sb); - if ( error || !root ) { - printk("Failure of coda_cnode_make for root: error %d\n", error); - goto error; + root = coda_cnode_make(&fid, sb); + if (IS_ERR(root)) { + error = PTR_ERR(root); + printk("Failure of coda_cnode_make for root: error %d\n", error); + root = NULL; + goto error; } printk("coda_read_super: rootinode is %ld dev %s\n", |
