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

Commit e20d96d6 authored by Chris Mason's avatar Chris Mason Committed by David Woodhouse
Browse files

Mountable btrfs, with readdir 



Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 2e635a27

fs/btrfs/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ ifneq ($(KERNELRELEASE),) 
# kbuild part of makefile



obj-m  := btrfs.o

btrfs-y := super.o

btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \

	   hash.o file-item.o inode-item.o inode-map.o disk-io.o



#btrfs-y := ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \

#	  root-tree.o dir-item.o hash.o file-item.o inode-item.o \
@@ -14,7 +15,7 @@ else 


KERNELDIR := /lib/modules/`uname -r`/build

all::

	$(MAKE) -C $(KERNELDIR) M=`pwd` modules

	$(MAKE) C=1 -C $(KERNELDIR) M=`pwd` modules

clean::

	rm *.o btrfs.ko

endif

fs/btrfs/ctree.c

+140 −133

File changed.

Preview size limit exceeded, changes collapsed.

fs/btrfs/ctree.h

+48 −14

File changed.

Preview size limit exceeded, changes collapsed.

fs/btrfs/dir-item.c

+7 −10
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root 
	key.objectid = dir;

	key.flags = 0;

	btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);

	if (name_len == 1 && *name == '.')

		key.offset = 1;

	else if (name_len == 2 && name[0] == '.' && name[1] == '.')

		key.offset = 2;

	else

	ret = btrfs_name_hash(name, name_len, &key.offset);

	BUG_ON(ret);

	btrfs_init_path(&path);
@@ -31,7 +26,8 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root 
	if (ret)

		goto out;



	dir_item = btrfs_item_ptr(&path.nodes[0]->leaf, path.slots[0],

	dir_item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]),

				  path.slots[0],

				  struct btrfs_dir_item);

	btrfs_set_dir_objectid(dir_item, objectid);

	btrfs_set_dir_type(dir_item, type);
@@ -45,8 +41,8 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root 
}



int btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root

			  *root, struct btrfs_path *path, u64 dir, char *name,

			  int name_len, int mod)

			  *root, struct btrfs_path *path, u64 dir,

			  const char *name, int name_len, int mod)

{

	int ret;

	struct btrfs_key key;
@@ -69,7 +65,8 @@ int btrfs_match_dir_item_name(struct btrfs_root *root, 
	struct btrfs_dir_item *dir_item;

	char *name_ptr;



	dir_item = btrfs_item_ptr(&path->nodes[0]->leaf, path->slots[0],

	dir_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),

				  path->slots[0],

				  struct btrfs_dir_item);

	if (btrfs_dir_name_len(dir_item) != name_len)

		return 0;

fs/btrfs/disk-io.c

+83 −198

File changed.

Preview size limit exceeded, changes collapsed.