diff options
Diffstat (limited to 'kernel/fs/hfsplus')
| -rw-r--r-- | kernel/fs/hfsplus/bnode.c | 3 | ||||
| -rw-r--r-- | kernel/fs/hfsplus/options.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/kernel/fs/hfsplus/bnode.c b/kernel/fs/hfsplus/bnode.c index 759708fd9..63924662a 100644 --- a/kernel/fs/hfsplus/bnode.c +++ b/kernel/fs/hfsplus/bnode.c @@ -454,7 +454,6 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid) page_cache_release(page); goto fail; } - page_cache_release(page); node->page[i] = page; } @@ -566,13 +565,11 @@ node_error: void hfs_bnode_free(struct hfs_bnode *node) { -#if 0 int i; for (i = 0; i < node->tree->pages_per_bnode; i++) if (node->page[i]) page_cache_release(node->page[i]); -#endif kfree(node); } diff --git a/kernel/fs/hfsplus/options.c b/kernel/fs/hfsplus/options.c index c90b72ee6..bb806e58c 100644 --- a/kernel/fs/hfsplus/options.c +++ b/kernel/fs/hfsplus/options.c @@ -218,9 +218,9 @@ int hfsplus_show_options(struct seq_file *seq, struct dentry *root) struct hfsplus_sb_info *sbi = HFSPLUS_SB(root->d_sb); if (sbi->creator != HFSPLUS_DEF_CR_TYPE) - seq_printf(seq, ",creator=%.4s", (char *)&sbi->creator); + seq_show_option_n(seq, "creator", (char *)&sbi->creator, 4); if (sbi->type != HFSPLUS_DEF_CR_TYPE) - seq_printf(seq, ",type=%.4s", (char *)&sbi->type); + seq_show_option_n(seq, "type", (char *)&sbi->type, 4); seq_printf(seq, ",umask=%o,uid=%u,gid=%u", sbi->umask, from_kuid_munged(&init_user_ns, sbi->uid), from_kgid_munged(&init_user_ns, sbi->gid)); |