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

Commit 324ef39a authored by Vyacheslav Dubeyko's avatar Vyacheslav Dubeyko Committed by Linus Torvalds
Browse files

hfsplus: add support of manipulation by attributes file 



Add support of manipulation by attributes file.

Signed-off-by: default avatarVyacheslav Dubeyko <slava@dubeyko.com>
Reported-by: default avatarHin-Tak Leung <htl10@users.sourceforge.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 127e5f5a

fs/hfsplus/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -5,5 +5,5 @@ 
obj-$(CONFIG_HFSPLUS_FS) += hfsplus.o



hfsplus-objs := super.o options.o inode.o ioctl.o extents.o catalog.o dir.o btree.o \

		bnode.o brec.o bfind.o tables.o unicode.o wrapper.o bitmap.o part_tbl.o

		bnode.o brec.o bfind.o tables.o unicode.o wrapper.o bitmap.o part_tbl.o \

		attributes.o xattr.o xattr_user.o xattr_security.o xattr_trusted.o

fs/hfsplus/bfind.c

+80 −13
Original line number Diff line number Diff line
@@ -24,7 +24,19 @@ int hfs_find_init(struct hfs_btree *tree, struct hfs_find_data *fd) 
	fd->key = ptr + tree->max_key_len + 2;

	dprint(DBG_BNODE_REFS, "find_init: %d (%p)\n",

		tree->cnid, __builtin_return_address(0));

	mutex_lock(&tree->tree_lock);

	switch (tree->cnid) {

	case HFSPLUS_CAT_CNID:

		mutex_lock_nested(&tree->tree_lock, CATALOG_BTREE_MUTEX);

		break;

	case HFSPLUS_EXT_CNID:

		mutex_lock_nested(&tree->tree_lock, EXTENTS_BTREE_MUTEX);

		break;

	case HFSPLUS_ATTR_CNID:

		mutex_lock_nested(&tree->tree_lock, ATTR_BTREE_MUTEX);

		break;

	default:

		BUG();

	}

	return 0;

}
@@ -38,15 +50,73 @@ void hfs_find_exit(struct hfs_find_data *fd) 
	fd->tree = NULL;

}



/* Find the record in bnode that best matches key (not greater than...)*/

int __hfs_brec_find(struct hfs_bnode *bnode, struct hfs_find_data *fd)

int hfs_find_1st_rec_by_cnid(struct hfs_bnode *bnode,

				struct hfs_find_data *fd,

				int *begin,

				int *end,

				int *cur_rec)

{

	__be32 cur_cnid, search_cnid;



	if (bnode->tree->cnid == HFSPLUS_EXT_CNID) {

		cur_cnid = fd->key->ext.cnid;

		search_cnid = fd->search_key->ext.cnid;

	} else if (bnode->tree->cnid == HFSPLUS_CAT_CNID) {

		cur_cnid = fd->key->cat.parent;

		search_cnid = fd->search_key->cat.parent;

	} else if (bnode->tree->cnid == HFSPLUS_ATTR_CNID) {

		cur_cnid = fd->key->attr.cnid;

		search_cnid = fd->search_key->attr.cnid;

	} else

		BUG();



	if (cur_cnid == search_cnid) {

		(*end) = (*cur_rec);

		if ((*begin) == (*end))

			return 1;

	} else {

		if (be32_to_cpu(cur_cnid) < be32_to_cpu(search_cnid))

			(*begin) = (*cur_rec) + 1;

		else

			(*end) = (*cur_rec) - 1;

	}



	return 0;

}



int hfs_find_rec_by_key(struct hfs_bnode *bnode,

				struct hfs_find_data *fd,

				int *begin,

				int *end,

				int *cur_rec)

{

	int cmpval;



	cmpval = bnode->tree->keycmp(fd->key, fd->search_key);

	if (!cmpval) {

		(*end) = (*cur_rec);

		return 1;

	}

	if (cmpval < 0)

		(*begin) = (*cur_rec) + 1;

	else

		*(end) = (*cur_rec) - 1;



	return 0;

}



/* Find the record in bnode that best matches key (not greater than...)*/

int __hfs_brec_find(struct hfs_bnode *bnode, struct hfs_find_data *fd,

					search_strategy_t rec_found)

{

	u16 off, len, keylen;

	int rec;

	int b, e;

	int res;



	if (!rec_found)

		BUG();



	b = 0;

	e = bnode->num_recs - 1;

	res = -ENOENT;
@@ -59,17 +129,12 @@ int __hfs_brec_find(struct hfs_bnode *bnode, struct hfs_find_data *fd) 
			goto fail;

		}

		hfs_bnode_read(bnode, fd->key, off, keylen);

		cmpval = bnode->tree->keycmp(fd->key, fd->search_key);

		if (!cmpval) {

			e = rec;

		if (rec_found(bnode, fd, &b, &e, &rec)) {

			res = 0;

			goto done;

		}

		if (cmpval < 0)

			b = rec + 1;

		else

			e = rec - 1;

	} while (b <= e);



	if (rec != e && e >= 0) {

		len = hfs_brec_lenoff(bnode, e, &off);

		keylen = hfs_brec_keylen(bnode, e);
@@ -79,19 +144,21 @@ int __hfs_brec_find(struct hfs_bnode *bnode, struct hfs_find_data *fd) 
		}

		hfs_bnode_read(bnode, fd->key, off, keylen);

	}



done:

	fd->record = e;

	fd->keyoffset = off;

	fd->keylength = keylen;

	fd->entryoffset = off + keylen;

	fd->entrylength = len - keylen;



fail:

	return res;

}



/* Traverse a B*Tree from the root to a leaf finding best fit to key */

/* Return allocated copy of node found, set recnum to best record */

int hfs_brec_find(struct hfs_find_data *fd)

int hfs_brec_find(struct hfs_find_data *fd, search_strategy_t do_key_compare)

{

	struct hfs_btree *tree;

	struct hfs_bnode *bnode;
@@ -122,7 +189,7 @@ int hfs_brec_find(struct hfs_find_data *fd) 
			goto invalid;

		bnode->parent = parent;



		res = __hfs_brec_find(bnode, fd);

		res = __hfs_brec_find(bnode, fd, do_key_compare);

		if (!height)

			break;

		if (fd->record < 0)
@@ -149,7 +216,7 @@ int hfs_brec_read(struct hfs_find_data *fd, void *rec, int rec_len) 
{

	int res;



	res = hfs_brec_find(fd);

	res = hfs_brec_find(fd, hfs_find_rec_by_key);

	if (res)

		return res;

	if (fd->entrylength > rec_len)

fs/hfsplus/bnode.c

+4 −2
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ void hfs_bnode_read_key(struct hfs_bnode *node, void *key, int off) 


	tree = node->tree;

	if (node->type == HFS_NODE_LEAF ||

	    tree->attributes & HFS_TREE_VARIDXKEYS)

	    tree->attributes & HFS_TREE_VARIDXKEYS ||

	    node->tree->cnid == HFSPLUS_ATTR_CNID)

		key_len = hfs_bnode_read_u16(node, off) + 2;

	else

		key_len = tree->max_key_len + 2;
@@ -314,7 +315,8 @@ void hfs_bnode_dump(struct hfs_bnode *node) 
		if (i && node->type == HFS_NODE_INDEX) {

			int tmp;



			if (node->tree->attributes & HFS_TREE_VARIDXKEYS)

			if (node->tree->attributes & HFS_TREE_VARIDXKEYS ||

					node->tree->cnid == HFSPLUS_ATTR_CNID)

				tmp = hfs_bnode_read_u16(node, key_off) + 2;

			else

				tmp = node->tree->max_key_len + 2;

fs/hfsplus/brec.c

+14 −9
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ u16 hfs_brec_keylen(struct hfs_bnode *node, u16 rec) 
		return 0;



	if ((node->type == HFS_NODE_INDEX) &&

	   !(node->tree->attributes & HFS_TREE_VARIDXKEYS)) {

	   !(node->tree->attributes & HFS_TREE_VARIDXKEYS) &&

	   (node->tree->cnid != HFSPLUS_ATTR_CNID)) {

		retval = node->tree->max_key_len + 2;

	} else {

		recoff = hfs_bnode_read_u16(node,
@@ -151,12 +152,13 @@ skip: 


		/* get index key */

		hfs_bnode_read_key(new_node, fd->search_key, 14);

		__hfs_brec_find(fd->bnode, fd);

		__hfs_brec_find(fd->bnode, fd, hfs_find_rec_by_key);



		hfs_bnode_put(new_node);

		new_node = NULL;



		if (tree->attributes & HFS_TREE_VARIDXKEYS)

		if ((tree->attributes & HFS_TREE_VARIDXKEYS) ||

				(tree->cnid == HFSPLUS_ATTR_CNID))

			key_len = be16_to_cpu(fd->search_key->key_len) + 2;

		else {

			fd->search_key->key_len =
@@ -201,7 +203,7 @@ again: 
		hfs_bnode_put(node);

		node = fd->bnode = parent;



		__hfs_brec_find(node, fd);

		__hfs_brec_find(node, fd, hfs_find_rec_by_key);

		goto again;

	}

	hfs_bnode_write_u16(node,
@@ -367,12 +369,13 @@ again: 
	parent = hfs_bnode_find(tree, node->parent);

	if (IS_ERR(parent))

		return PTR_ERR(parent);

	__hfs_brec_find(parent, fd);

	__hfs_brec_find(parent, fd, hfs_find_rec_by_key);

	hfs_bnode_dump(parent);

	rec = fd->record;



	/* size difference between old and new key */

	if (tree->attributes & HFS_TREE_VARIDXKEYS)

	if ((tree->attributes & HFS_TREE_VARIDXKEYS) ||

				(tree->cnid == HFSPLUS_ATTR_CNID))

		newkeylen = hfs_bnode_read_u16(node, 14) + 2;

	else

		fd->keylength = newkeylen = tree->max_key_len + 2;
@@ -427,7 +430,7 @@ skip: 
		hfs_bnode_read_key(new_node, fd->search_key, 14);

		cnid = cpu_to_be32(new_node->this);



		__hfs_brec_find(fd->bnode, fd);

		__hfs_brec_find(fd->bnode, fd, hfs_find_rec_by_key);

		hfs_brec_insert(fd, &cnid, sizeof(cnid));

		hfs_bnode_put(fd->bnode);

		hfs_bnode_put(new_node);
@@ -495,13 +498,15 @@ static int hfs_btree_inc_height(struct hfs_btree *tree) 
		/* insert old root idx into new root */

		node->parent = tree->root;

		if (node->type == HFS_NODE_LEAF ||

		    tree->attributes & HFS_TREE_VARIDXKEYS)

				tree->attributes & HFS_TREE_VARIDXKEYS ||

				tree->cnid == HFSPLUS_ATTR_CNID)

			key_size = hfs_bnode_read_u16(node, 14) + 2;

		else

			key_size = tree->max_key_len + 2;

		hfs_bnode_copy(new_node, 14, node, 14, key_size);



		if (!(tree->attributes & HFS_TREE_VARIDXKEYS)) {

		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);

		}

fs/hfsplus/btree.c

+8 −0
Original line number Diff line number Diff line
@@ -98,6 +98,14 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id) 
			set_bit(HFSPLUS_SB_CASEFOLD, &HFSPLUS_SB(sb)->flags);

		}

		break;

	case HFSPLUS_ATTR_CNID:

		if (tree->max_key_len != HFSPLUS_ATTR_KEYLEN - sizeof(u16)) {

			printk(KERN_ERR "hfs: invalid attributes max_key_len %d\n",

				tree->max_key_len);

			goto fail_page;

		}

		tree->keycmp = hfsplus_attr_bin_cmp_key;

		break;

	default:

		printk(KERN_ERR "hfs: unknown B*Tree requested\n");

		goto fail_page;