Commit 94a48aef authored by Omar Sandoval's avatar Omar Sandoval Committed by David Sterba
Browse files

btrfs: extend btrfs_dir_item type to store encryption status 



For directories with encrypted files/filenames, we need to store a flag
indicating this fact. There's no room in other fields, so we'll need to
borrow a bit from dir_type. Since it's now a combination of type and
flags, we rename it to dir_flags to reflect its new usage.

The new flag, FT_ENCRYPTED, indicates a directory containing encrypted
data, which is orthogonal to file type; therefore, add the new
flag, and make conversion from directory type to file type strip the
flag.

As the file types almost never change we can afford to use the bits.
Actual usage will be guarded behind an incompat bit, this patch only
adds the support for later use by fscrypt.

Signed-off-by: default avatarOmar Sandoval <osandov@osandov.com>
Signed-off-by: default avatarSweet Tea Dorminy <sweettea-kernel@dorminy.me>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6db75318

fs/btrfs/accessors.h

+13 −2
Original line number Diff line number Diff line
@@ -484,14 +484,25 @@ BTRFS_SETGET_FUNCS(root_ref_name_len, struct btrfs_root_ref, name_len, 16); 


/* struct btrfs_dir_item */

BTRFS_SETGET_FUNCS(dir_data_len, struct btrfs_dir_item, data_len, 16);

BTRFS_SETGET_FUNCS(dir_type, struct btrfs_dir_item, type, 8);

BTRFS_SETGET_FUNCS(dir_flags, struct btrfs_dir_item, type, 8);

BTRFS_SETGET_FUNCS(dir_name_len, struct btrfs_dir_item, name_len, 16);

BTRFS_SETGET_FUNCS(dir_transid, struct btrfs_dir_item, transid, 64);

BTRFS_SETGET_STACK_FUNCS(stack_dir_type, struct btrfs_dir_item, type, 8);

BTRFS_SETGET_STACK_FUNCS(stack_dir_flags, struct btrfs_dir_item, type, 8);

BTRFS_SETGET_STACK_FUNCS(stack_dir_data_len, struct btrfs_dir_item, data_len, 16);

BTRFS_SETGET_STACK_FUNCS(stack_dir_name_len, struct btrfs_dir_item, name_len, 16);

BTRFS_SETGET_STACK_FUNCS(stack_dir_transid, struct btrfs_dir_item, transid, 64);



static inline u8 btrfs_dir_ftype(const struct extent_buffer *eb,

				 const struct btrfs_dir_item *item)

{

	return btrfs_dir_flags_to_ftype(btrfs_dir_flags(eb, item));

}



static inline u8 btrfs_stack_dir_ftype(const struct btrfs_dir_item *item)

{

	return btrfs_dir_flags_to_ftype(btrfs_stack_dir_flags(item));

}



static inline void btrfs_dir_item_key(const struct extent_buffer *eb,

				      const struct btrfs_dir_item *item,

				      struct btrfs_disk_key *key)

fs/btrfs/delayed-inode.c

+3 −3
Original line number Diff line number Diff line
@@ -1416,7 +1416,7 @@ void btrfs_balance_delayed_items(struct btrfs_fs_info *fs_info) 
int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,

				   const char *name, int name_len,

				   struct btrfs_inode *dir,

				   struct btrfs_disk_key *disk_key, u8 type,

				   struct btrfs_disk_key *disk_key, u8 flags,

				   u64 index)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;
@@ -1447,7 +1447,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, 
	btrfs_set_stack_dir_transid(dir_item, trans->transid);

	btrfs_set_stack_dir_data_len(dir_item, 0);

	btrfs_set_stack_dir_name_len(dir_item, name_len);

	btrfs_set_stack_dir_type(dir_item, type);

	btrfs_set_stack_dir_flags(dir_item, flags);

	memcpy((char *)(dir_item + 1), name, name_len);



	data_len = delayed_item->data_len + sizeof(struct btrfs_item);
@@ -1757,7 +1757,7 @@ int btrfs_readdir_delayed_dir_index(struct dir_context *ctx, 
		name = (char *)(di + 1);

		name_len = btrfs_stack_dir_name_len(di);



		d_type = fs_ftype_to_dtype(di->type);

		d_type = fs_ftype_to_dtype(btrfs_dir_flags_to_ftype(di->type));

		btrfs_disk_key_to_cpu(&location, &di->location);



		over = !dir_emit(ctx, name, name_len,

fs/btrfs/delayed-inode.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static inline void btrfs_init_delayed_root( 
int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,

				   const char *name, int name_len,

				   struct btrfs_inode *dir,

				   struct btrfs_disk_key *disk_key, u8 type,

				   struct btrfs_disk_key *disk_key, u8 flags,

				   u64 index);



int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,

fs/btrfs/dir-item.c

+5 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans, 
	leaf = path->nodes[0];

	btrfs_cpu_key_to_disk(&disk_key, &location);

	btrfs_set_dir_item_key(leaf, dir_item, &disk_key);

	btrfs_set_dir_type(leaf, dir_item, BTRFS_FT_XATTR);

	btrfs_set_dir_flags(leaf, dir_item, BTRFS_FT_XATTR);

	btrfs_set_dir_name_len(leaf, dir_item, name_len);

	btrfs_set_dir_transid(leaf, dir_item, trans->transid);

	btrfs_set_dir_data_len(leaf, dir_item, data_len);
@@ -140,9 +140,12 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, 
		goto out_free;

	}



	if (IS_ENCRYPTED(&dir->vfs_inode))

		type |= BTRFS_FT_ENCRYPTED;



	leaf = path->nodes[0];

	btrfs_set_dir_item_key(leaf, dir_item, &disk_key);

	btrfs_set_dir_type(leaf, dir_item, type);

	btrfs_set_dir_flags(leaf, dir_item, type);

	btrfs_set_dir_data_len(leaf, dir_item, 0);

	btrfs_set_dir_name_len(leaf, dir_item, name->len);

	btrfs_set_dir_transid(leaf, dir_item, trans->transid);

fs/btrfs/inode.c

+7 −6
Original line number Diff line number Diff line
@@ -5597,7 +5597,7 @@ static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry, 
			   location->objectid, location->type, location->offset);

	}

	if (!ret)

		*type = btrfs_dir_type(path->nodes[0], di);

		*type = btrfs_dir_ftype(path->nodes[0], di);

out:

	fscrypt_free_filename(&fname);

	btrfs_free_path(path);
@@ -6046,6 +6046,7 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx) 
	btrfs_for_each_slot(root, &key, &found_key, path, ret) {

		struct dir_entry *entry;

		struct extent_buffer *leaf = path->nodes[0];

		u8 ftype;



		if (found_key.objectid != key.objectid)

			break;
@@ -6069,13 +6070,13 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx) 
			goto again;

		}



		ftype = btrfs_dir_flags_to_ftype(btrfs_dir_flags(leaf, di));

		entry = addr;

		put_unaligned(name_len, &entry->name_len);

		name_ptr = (char *)(entry + 1);

		read_extent_buffer(leaf, name_ptr, (unsigned long)(di + 1),

				   name_len);

		put_unaligned(fs_ftype_to_dtype(btrfs_dir_type(leaf, di)),

				&entry->type);

		read_extent_buffer(leaf, name_ptr,

				   (unsigned long)(di + 1), name_len);

		put_unaligned(name_len, &entry->name_len);

		put_unaligned(fs_ftype_to_dtype(ftype), &entry->type);

		btrfs_dir_item_key_to_cpu(leaf, di, &location);

		put_unaligned(location.objectid, &entry->ino);

		put_unaligned(found_key.offset, &entry->offset);