Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f2fc81e authored by Hin-Tak Leung's avatar Hin-Tak Leung Committed by Linus Torvalds
Browse files

hfsplus: remove unused routine hfsplus_attr_build_key_uni 



The directory/file catalog b-tree equivalent, hfsplus_build_key_uni(),
is used by hfsplus_find_cat() for internal referencing between catalog
records.  There is no corresponding usage for attributes - attribute
records do not refer to one another.

Signed-off-by: default avatarHin-Tak Leung <htl10@users.sourceforge.net>
Cc: Sougata Santra <sougata@tuxera.com>
Cc: Anton Altaparmakov <anton@tuxera.com>
Cc: Vyacheslav Dubeyko <slava@dubeyko.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bf29e886

fs/hfsplus/attributes.c

+0 −25
Original line number Diff line number Diff line
@@ -79,31 +79,6 @@ int hfsplus_attr_build_key(struct super_block *sb, hfsplus_btree_key *key, 
	return 0;

}



void hfsplus_attr_build_key_uni(hfsplus_btree_key *key,

					u32 cnid,

					struct hfsplus_attr_unistr *name)

{

	int ustrlen;



	memset(key, 0, sizeof(struct hfsplus_attr_key));

	ustrlen = be16_to_cpu(name->length);

	key->attr.cnid = cpu_to_be32(cnid);

	key->attr.key_name.length = cpu_to_be16(ustrlen);

	ustrlen *= 2;

	memcpy(key->attr.key_name.unicode, name->unicode, ustrlen);



	/* The length of the key, as stored in key_len field, does not include

	 * the size of the key_len field itself.

	 * So, offsetof(hfsplus_attr_key, key_name) is a trick because

	 * it takes into consideration key_len field (__be16) of

	 * hfsplus_attr_key structure instead of length field (__be16) of

	 * hfsplus_attr_unistr structure.

	 */

	key->key_len =

		cpu_to_be16(offsetof(struct hfsplus_attr_key, key_name) +

				ustrlen);

}



hfsplus_attr_entry *hfsplus_alloc_attr_entry(void)

{

	return kmem_cache_alloc(hfsplus_attr_tree_cachep, GFP_KERNEL);

fs/hfsplus/hfsplus_fs.h

+0 −3
Original line number Diff line number Diff line
@@ -375,9 +375,6 @@ int hfsplus_attr_bin_cmp_key(const hfsplus_btree_key *, 
		const hfsplus_btree_key *);

int hfsplus_attr_build_key(struct super_block *, hfsplus_btree_key *,

			u32, const char *);

void hfsplus_attr_build_key_uni(hfsplus_btree_key *key,

					u32 cnid,

					struct hfsplus_attr_unistr *name);

int hfsplus_find_attr(struct super_block *, u32,

			const char *, struct hfs_find_data *);

int hfsplus_attr_exists(struct inode *inode, const char *name);