diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-10 17:48:52 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-10 17:48:52 -0500 |
commit | b3f2a92447b8443360ac117a3d7c06689562a70c (patch) | |
tree | c30e40122be3140aeabdb27bb9960fbb9ed2e730 | |
parent | ace8577aeb438025ecf642f5eda3aa551d251951 (diff) | |
download | op-kernel-dev-b3f2a92447b8443360ac117a3d7c06689562a70c.zip op-kernel-dev-b3f2a92447b8443360ac117a3d7c06689562a70c.tar.gz |
hfsplus: creation of hidden dir on mount can fail
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/hfsplus/super.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index edf0a80..427682c 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c @@ -499,9 +499,16 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent) if (!sbi->hidden_dir) { mutex_lock(&sbi->vh_mutex); sbi->hidden_dir = hfsplus_new_inode(sb, S_IFDIR); - hfsplus_create_cat(sbi->hidden_dir->i_ino, root, &str, - sbi->hidden_dir); + if (!sbi->hidden_dir) { + mutex_unlock(&sbi->vh_mutex); + err = -ENOMEM; + goto out_put_root; + } + err = hfsplus_create_cat(sbi->hidden_dir->i_ino, root, + &str, sbi->hidden_dir); mutex_unlock(&sbi->vh_mutex); + if (err) + goto out_put_hidden_dir; hfsplus_mark_inode_dirty(sbi->hidden_dir, HFSPLUS_I_CAT_DIRTY); |