brec.c and btree.c in both drivers use the literal 14 for the size of struct hfs_bnode_desc, which is also the offset of record 0 in a node. Add HFS_BNODE_DESC_SIZE next to the structure and use it instead. No functional change. The next two patches use the new name in the hfs_bnode_read_key() calls they change. Suggested-by: Viacheslav Dubeyko Cc: stable@vger.kernel.org # prerequisite for the next two patches Signed-off-by: ozgun kultekin --- v3: new patch, as requested by Viacheslav fs/hfs/brec.c | 32 +++++++++++++++++++++----------- fs/hfs/btree.c | 4 ++-- fs/hfsplus/brec.c | 31 ++++++++++++++++++++----------- fs/hfsplus/btree.c | 4 ++-- include/linux/hfs_common.h | 3 +++ 5 files changed, 48 insertions(+), 26 deletions(-) diff --git a/fs/hfs/brec.c b/fs/hfs/brec.c index 1ca1ee9f7..31574e562 100644 --- a/fs/hfs/brec.c +++ b/fs/hfs/brec.c @@ -156,7 +156,8 @@ int hfs_brec_insert(struct hfs_find_data *fd, void *entry, u32 entry_len) entry_len = sizeof(cnid); /* get index key */ - hfs_bnode_read_key(new_node, fd->search_key, 14); + hfs_bnode_read_key(new_node, fd->search_key, + HFS_BNODE_DESC_SIZE); __hfs_brec_find(fd->bnode, fd); hfs_bnode_put(new_node); @@ -402,7 +403,8 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd) /* size difference between old and new key */ if (tree->attributes & HFS_TREE_VARIDXKEYS) - newkeylen = (hfs_bnode_read_u8(node, 14) | 1) + 1; + newkeylen = (hfs_bnode_read_u8(node, + HFS_BNODE_DESC_SIZE) | 1) + 1; else fd->keylength = newkeylen = tree->max_key_len + 1; hfs_dbg("rec %d, keylength %d, newkeylen %d\n", @@ -441,7 +443,8 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd) hfs_bnode_move(parent, start_off + diff, start_off, end_off - start_off); skip: - hfs_bnode_copy(parent, fd->keyoffset, node, 14, newkeylen); + hfs_bnode_copy(parent, fd->keyoffset, node, HFS_BNODE_DESC_SIZE, + newkeylen); if (!(tree->attributes & HFS_TREE_VARIDXKEYS)) hfs_bnode_write_u8(parent, fd->keyoffset, newkeylen - 1); hfs_bnode_dump(parent); @@ -458,7 +461,8 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd) } fd->bnode = hfs_bnode_find(tree, new_node->parent); /* create index key and entry */ - hfs_bnode_read_key(new_node, fd->search_key, 14); + hfs_bnode_read_key(new_node, fd->search_key, + HFS_BNODE_DESC_SIZE); cnid = cpu_to_be32(new_node->this); __hfs_brec_find(fd->bnode, fd); @@ -470,7 +474,8 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd) if (new_node == node) goto out; /* restore search_key */ - hfs_bnode_read_key(node, fd->search_key, 14); + hfs_bnode_read_key(node, fd->search_key, + HFS_BNODE_DESC_SIZE); } new_node = NULL; } @@ -524,28 +529,33 @@ static int hfs_btree_inc_height(struct hfs_btree *tree) hfs_bnode_write(new_node, &node_desc, 0, sizeof(node_desc)); rec = tree->node_size - 2; - hfs_bnode_write_u16(new_node, rec, 14); + hfs_bnode_write_u16(new_node, rec, HFS_BNODE_DESC_SIZE); if (node) { /* insert old root idx into new root */ node->parent = tree->root; if (node->type == HFS_NODE_LEAF || tree->attributes & HFS_TREE_VARIDXKEYS) - key_size = hfs_bnode_read_u8(node, 14) + 1; + key_size = hfs_bnode_read_u8(node, + HFS_BNODE_DESC_SIZE) + 1; else key_size = tree->max_key_len + 1; - hfs_bnode_copy(new_node, 14, node, 14, key_size); + hfs_bnode_copy(new_node, HFS_BNODE_DESC_SIZE, node, + HFS_BNODE_DESC_SIZE, key_size); if (!(tree->attributes & HFS_TREE_VARIDXKEYS)) { key_size = tree->max_key_len + 1; - hfs_bnode_write_u8(new_node, 14, tree->max_key_len); + hfs_bnode_write_u8(new_node, HFS_BNODE_DESC_SIZE, + tree->max_key_len); } key_size = (key_size + 1) & -2; cnid = cpu_to_be32(node->this); - hfs_bnode_write(new_node, &cnid, 14 + key_size, 4); + hfs_bnode_write(new_node, &cnid, + HFS_BNODE_DESC_SIZE + key_size, 4); rec -= 2; - hfs_bnode_write_u16(new_node, rec, 14 + key_size + 4); + hfs_bnode_write_u16(new_node, rec, + HFS_BNODE_DESC_SIZE + key_size + 4); hfs_bnode_put(node); } diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c index f07038403..4c2f82c1c 100644 --- a/fs/hfs/btree.c +++ b/fs/hfs/btree.c @@ -356,8 +356,8 @@ static struct hfs_bnode *hfs_bmap_new_bmap(struct hfs_bnode *prev, u32 idx) desc.num_recs = cpu_to_be16(1); desc.reserved = 0; hfs_bnode_write(node, &desc, 0, sizeof(desc)); - hfs_bnode_write_u16(node, 14, 0x8000); - hfs_bnode_write_u16(node, tree->node_size - 2, 14); + hfs_bnode_write_u16(node, HFS_BNODE_DESC_SIZE, 0x8000); + hfs_bnode_write_u16(node, tree->node_size - 2, HFS_BNODE_DESC_SIZE); hfs_bnode_write_u16(node, tree->node_size - 4, tree->node_size - 6); return node; diff --git a/fs/hfsplus/brec.c b/fs/hfsplus/brec.c index f416e562d..37e058c5d 100644 --- a/fs/hfsplus/brec.c +++ b/fs/hfsplus/brec.c @@ -166,7 +166,8 @@ int hfs_brec_insert(struct hfs_find_data *fd, void *entry, u32 entry_len) entry_len = sizeof(cnid); /* get index key */ - hfs_bnode_read_key(new_node, fd->search_key, 14); + hfs_bnode_read_key(new_node, fd->search_key, + HFS_BNODE_DESC_SIZE); __hfs_brec_find(fd->bnode, fd, hfs_find_rec_by_key); hfs_bnode_put(new_node); @@ -409,7 +410,7 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd) /* size difference between old and new key */ if ((tree->attributes & HFS_TREE_VARIDXKEYS) || (tree->cnid == HFSPLUS_ATTR_CNID)) - newkeylen = hfs_bnode_read_u16(node, 14) + 2; + newkeylen = hfs_bnode_read_u16(node, HFS_BNODE_DESC_SIZE) + 2; else fd->keylength = newkeylen = tree->max_key_len + 2; hfs_dbg("rec %d, keylength %d, newkeylen %d\n", @@ -449,7 +450,8 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd) hfs_bnode_move(parent, start_off + diff, start_off, end_off - start_off); skip: - hfs_bnode_copy(parent, fd->keyoffset, node, 14, newkeylen); + hfs_bnode_copy(parent, fd->keyoffset, node, HFS_BNODE_DESC_SIZE, + newkeylen); hfs_bnode_dump(parent); hfs_bnode_put(node); @@ -464,7 +466,8 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd) } fd->bnode = hfs_bnode_find(tree, new_node->parent); /* create index key and entry */ - hfs_bnode_read_key(new_node, fd->search_key, 14); + hfs_bnode_read_key(new_node, fd->search_key, + HFS_BNODE_DESC_SIZE); cnid = cpu_to_be32(new_node->this); __hfs_brec_find(fd->bnode, fd, hfs_find_rec_by_key); @@ -476,7 +479,8 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd) if (new_node == node) goto out; /* restore search_key */ - hfs_bnode_read_key(node, fd->search_key, 14); + hfs_bnode_read_key(node, fd->search_key, + HFS_BNODE_DESC_SIZE); } new_node = NULL; } @@ -530,7 +534,7 @@ static int hfs_btree_inc_height(struct hfs_btree *tree) hfs_bnode_write(new_node, &node_desc, 0, sizeof(node_desc)); rec = tree->node_size - 2; - hfs_bnode_write_u16(new_node, rec, 14); + hfs_bnode_write_u16(new_node, rec, HFS_BNODE_DESC_SIZE); if (node) { /* insert old root idx into new root */ @@ -538,21 +542,26 @@ static int hfs_btree_inc_height(struct hfs_btree *tree) if (node->type == HFS_NODE_LEAF || tree->attributes & HFS_TREE_VARIDXKEYS || tree->cnid == HFSPLUS_ATTR_CNID) - key_size = hfs_bnode_read_u16(node, 14) + 2; + key_size = hfs_bnode_read_u16(node, + HFS_BNODE_DESC_SIZE) + 2; else key_size = tree->max_key_len + 2; - hfs_bnode_copy(new_node, 14, node, 14, key_size); + hfs_bnode_copy(new_node, HFS_BNODE_DESC_SIZE, node, + HFS_BNODE_DESC_SIZE, key_size); if (!(tree->attributes & HFS_TREE_VARIDXKEYS) && (tree->cnid != HFSPLUS_ATTR_CNID)) { key_size = tree->max_key_len + 2; - hfs_bnode_write_u16(new_node, 14, tree->max_key_len); + hfs_bnode_write_u16(new_node, HFS_BNODE_DESC_SIZE, + tree->max_key_len); } cnid = cpu_to_be32(node->this); - hfs_bnode_write(new_node, &cnid, 14 + key_size, 4); + hfs_bnode_write(new_node, &cnid, + HFS_BNODE_DESC_SIZE + key_size, 4); rec -= 2; - hfs_bnode_write_u16(new_node, rec, 14 + key_size + 4); + hfs_bnode_write_u16(new_node, rec, + HFS_BNODE_DESC_SIZE + key_size + 4); hfs_bnode_put(node); } diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c index 0a9b32d5c..519f07b81 100644 --- a/fs/hfsplus/btree.c +++ b/fs/hfsplus/btree.c @@ -497,8 +497,8 @@ static struct hfs_bnode *hfs_bmap_new_bmap(struct hfs_bnode *prev, u32 idx) desc.num_recs = cpu_to_be16(1); desc.reserved = 0; hfs_bnode_write(node, &desc, 0, sizeof(desc)); - hfs_bnode_write_u16(node, 14, 0x8000); - hfs_bnode_write_u16(node, tree->node_size - 2, 14); + hfs_bnode_write_u16(node, HFS_BNODE_DESC_SIZE, 0x8000); + hfs_bnode_write_u16(node, tree->node_size - 2, HFS_BNODE_DESC_SIZE); hfs_bnode_write_u16(node, tree->node_size - 4, tree->node_size - 6); return node; diff --git a/include/linux/hfs_common.h b/include/linux/hfs_common.h index 802d1590e..1b639bbd1 100644 --- a/include/linux/hfs_common.h +++ b/include/linux/hfs_common.h @@ -495,6 +495,9 @@ struct hfs_bnode_desc { u16 reserved; } __packed; +/* Size of the node descriptor, which is also the offset of record 0 */ +#define HFS_BNODE_DESC_SIZE sizeof(struct hfs_bnode_desc) + /* HFS/HFS+ BTree node types */ #define HFS_NODE_INDEX 0x00 /* An internal (index) node */ #define HFS_NODE_HEADER 0x01 /* The tree header node (node 0) */ -- 2.39.5