Subject: [merged] hfsplus-remove-unused-routine-hfsplus_attr_build_key_uni.patch removed from -mm tree To: htl10@xxxxxxxxxxxxxxxxxxxxx,anton@xxxxxxxxxx,hch@xxxxxxxxxxxxx,slava@xxxxxxxxxxx,sougata@xxxxxxxxxx,viro@xxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 09 Jun 2014 12:31:47 -0700 The patch titled Subject: hfsplus: remove unused routine hfsplus_attr_build_key_uni has been removed from the -mm tree. Its filename was hfsplus-remove-unused-routine-hfsplus_attr_build_key_uni.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx> Subject: 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: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx> Cc: Sougata Santra <sougata@xxxxxxxxxx> Cc: Anton Altaparmakov <anton@xxxxxxxxxx> Cc: Vyacheslav Dubeyko <slava@xxxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/hfsplus/attributes.c | 25 ------------------------- fs/hfsplus/hfsplus_fs.h | 3 --- 2 files changed, 28 deletions(-) diff -puN fs/hfsplus/attributes.c~hfsplus-remove-unused-routine-hfsplus_attr_build_key_uni fs/hfsplus/attributes.c --- a/fs/hfsplus/attributes.c~hfsplus-remove-unused-routine-hfsplus_attr_build_key_uni +++ a/fs/hfsplus/attributes.c @@ -79,31 +79,6 @@ int hfsplus_attr_build_key(struct super_ 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); diff -puN fs/hfsplus/hfsplus_fs.h~hfsplus-remove-unused-routine-hfsplus_attr_build_key_uni fs/hfsplus/hfsplus_fs.h --- a/fs/hfsplus/hfsplus_fs.h~hfsplus-remove-unused-routine-hfsplus_attr_build_key_uni +++ a/fs/hfsplus/hfsplus_fs.h @@ -375,9 +375,6 @@ int hfsplus_attr_bin_cmp_key(const hfspl 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); _ Patches currently in -mm which might be from htl10@xxxxxxxxxxxxxxxxxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html