Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes

[linux.git] / fs / hfsplus / bnode.c

diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c
index d77015c3f22c2208e9ba0bce7733fe5f9f639d40..177fae4e6581439bb7748ffdba99f91095da3bcc 100644 (file)
--- a/fs/hfsplus/bnode.c
+++ b/fs/hfsplus/bnode.c
@@ -127,14 +127,12 @@ void hfs_bnode_clear(struct hfs_bnode *node, int off, int len)
 void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst,
                    struct hfs_bnode *src_node, int src, int len)
 {
-       struct hfs_btree *tree;
        struct page **src_page, **dst_page;
        int l;
 
        hfs_dbg(BNODE_MOD, "copybytes: %u,%u,%u\n", dst, src, len);
        if (!len)
                return;
-       tree = src_node->tree;
        src += src_node->page_offset;
        dst += dst_node->page_offset;
        src_page = src_node->page + (src >> PAGE_SHIFT);
@@ -401,7 +399,6 @@ struct hfs_bnode *hfs_bnode_findhash(struct hfs_btree *tree, u32 cnid)
 
 static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
 {
-       struct super_block *sb;
        struct hfs_bnode *node, *node2;
        struct address_space *mapping;
        struct page *page;
@@ -414,7 +411,6 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
                return NULL;
        }
 
-       sb = tree->inode->i_sb;
        size = sizeof(struct hfs_bnode) + tree->pages_per_bnode *
                sizeof(struct page *);
        node = kzalloc(size, GFP_KERNEL);