diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-05 02:37:59 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-05 02:37:59 +0300 |
| commit | 9e0243db6169d7d1fc39a087e78fed22a2fe7071 (patch) | |
| tree | 867da284894bc179e0d6f4df062e293fa5dfe85b /fs | |
| parent | b067c9045af4791a5836042f743d12477131f7b5 (diff) | |
| parent | 8a545f185145e3c09348cd74326268ecfc6715a3 (diff) | |
| download | linux-9e0243db6169d7d1fc39a087e78fed22a2fe7071.tar.xz | |
Merge branch 'for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
"Beside of various fixes this also contains patches to enable features
such was Kcov, kmemleak and TRACE_IRQFLAGS_SUPPORT on UML"
* 'for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
hostfs: Freeing an ERR_PTR in hostfs_fill_sb_common()
um: Support kcov
um: Enable TRACE_IRQFLAGS_SUPPORT
um: Use asm-generic/irqflags.h
um: Fix possible deadlock in sig_handler_common()
um: Select HAVE_DEBUG_KMEMLEAK
um: Setup physical memory in setup_arch()
um: Eliminate null test after alloc_bootmem
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/hostfs/hostfs_kern.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 5c57654927a6..90e46cd752fe 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -959,10 +959,11 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) if (S_ISLNK(root_inode->i_mode)) { char *name = follow_link(host_root_path); - if (IS_ERR(name)) + if (IS_ERR(name)) { err = PTR_ERR(name); - else - err = read_name(root_inode, name); + goto out_put; + } + err = read_name(root_inode, name); kfree(name); if (err) goto out_put; |