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

Commit ec42f167 authored by Misono Tomohiro's avatar Misono Tomohiro Committed by David Sterba
Browse files

btrfs: Move may_destroy_subvol() from ioctl.c to inode.c 



This is a preparation work to refactor btrfs_ioctl_snap_destroy()
and to allow rmdir(2) to delete an empty subvolume.

Signed-off-by: default avatarTomohiro Misono <misono.tomohiro@jp.fujitsu.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
[ minor update of the function comment ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3b079a91

fs/btrfs/ctree.h

+1 −0
Original line number Diff line number Diff line
@@ -3197,6 +3197,7 @@ int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, 
			struct btrfs_root *root,

			struct inode *dir, u64 objectid,

			const char *name, int name_len);

noinline int may_destroy_subvol(struct btrfs_root *root);

int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,

			int front);

int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,

fs/btrfs/inode.c

+55 −0
Original line number Diff line number Diff line
@@ -4326,6 +4326,61 @@ int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, 
	return ret;

}



/*

 * Helper to check if the subvolume references other subvolumes or if it's

 * default.

 */

noinline int may_destroy_subvol(struct btrfs_root *root)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_path *path;

	struct btrfs_dir_item *di;

	struct btrfs_key key;

	u64 dir_id;

	int ret;



	path = btrfs_alloc_path();

	if (!path)

		return -ENOMEM;



	/* Make sure this root isn't set as the default subvol */

	dir_id = btrfs_super_root_dir(fs_info->super_copy);

	di = btrfs_lookup_dir_item(NULL, fs_info->tree_root, path,

				   dir_id, "default", 7, 0);

	if (di && !IS_ERR(di)) {

		btrfs_dir_item_key_to_cpu(path->nodes[0], di, &key);

		if (key.objectid == root->root_key.objectid) {

			ret = -EPERM;

			btrfs_err(fs_info,

				  "deleting default subvolume %llu is not allowed",

				  key.objectid);

			goto out;

		}

		btrfs_release_path(path);

	}



	key.objectid = root->root_key.objectid;

	key.type = BTRFS_ROOT_REF_KEY;

	key.offset = (u64)-1;



	ret = btrfs_search_slot(NULL, fs_info->tree_root, &key, path, 0, 0);

	if (ret < 0)

		goto out;

	BUG_ON(ret == 0);



	ret = 0;

	if (path->slots[0] > 0) {

		path->slots[0]--;

		btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);

		if (key.objectid == root->root_key.objectid &&

		    key.type == BTRFS_ROOT_REF_KEY)

			ret = -ENOTEMPTY;

	}

out:

	btrfs_free_path(path);

	return ret;

}



static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)

{

	struct inode *inode = d_inode(dentry);

fs/btrfs/ioctl.c

+0 −54
Original line number Diff line number Diff line
@@ -1832,60 +1832,6 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file, 
	return ret;

}



/*

 * helper to check if the subvolume references other subvolumes

 */

static noinline int may_destroy_subvol(struct btrfs_root *root)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_path *path;

	struct btrfs_dir_item *di;

	struct btrfs_key key;

	u64 dir_id;

	int ret;



	path = btrfs_alloc_path();

	if (!path)

		return -ENOMEM;



	/* Make sure this root isn't set as the default subvol */

	dir_id = btrfs_super_root_dir(fs_info->super_copy);

	di = btrfs_lookup_dir_item(NULL, fs_info->tree_root, path,

				   dir_id, "default", 7, 0);

	if (di && !IS_ERR(di)) {

		btrfs_dir_item_key_to_cpu(path->nodes[0], di, &key);

		if (key.objectid == root->root_key.objectid) {

			ret = -EPERM;

			btrfs_err(fs_info,

				  "deleting default subvolume %llu is not allowed",

				  key.objectid);

			goto out;

		}

		btrfs_release_path(path);

	}



	key.objectid = root->root_key.objectid;

	key.type = BTRFS_ROOT_REF_KEY;

	key.offset = (u64)-1;



	ret = btrfs_search_slot(NULL, fs_info->tree_root, &key, path, 0, 0);

	if (ret < 0)

		goto out;

	BUG_ON(ret == 0);



	ret = 0;

	if (path->slots[0] > 0) {

		path->slots[0]--;

		btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);

		if (key.objectid == root->root_key.objectid &&

		    key.type == BTRFS_ROOT_REF_KEY)

			ret = -ENOTEMPTY;

	}

out:

	btrfs_free_path(path);

	return ret;

}



static noinline int key_in_sk(struct btrfs_key *key,

			      struct btrfs_ioctl_search_key *sk)

{