diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-25 13:58:50 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-25 13:58:50 +1000 |
| commit | c7fa5bfd3e6518947b8b33fa53aaedc6bf9f4b7e (patch) | |
| tree | b95e69d3b7c95c5852e3abe45e60edd7972edce2 /fs/hfsplus/super.c | |
| parent | 20e78eeb1b448655dfdc3377f45b3e49ac5e8e99 (diff) | |
| parent | a7d66c114cee965d4a6d719b9526e168e9a31d45 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'fs/hfsplus/super.c')
| -rw-r--r-- | fs/hfsplus/super.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index 4cf2024b87da..593af2fdcc2d 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c @@ -515,7 +515,9 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent) err = hfs_find_init(sbi->cat_tree, &fd); if (err) goto out_put_root; - hfsplus_cat_build_key(sb, fd.search_key, HFSPLUS_ROOT_CNID, &str); + err = hfsplus_cat_build_key(sb, fd.search_key, HFSPLUS_ROOT_CNID, &str); + if (unlikely(err < 0)) + goto out_put_root; if (!hfs_brec_read(&fd, &entry, sizeof(entry))) { hfs_find_exit(&fd); if (entry.type != cpu_to_be16(HFSPLUS_FOLDER)) |