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

Commit 6618a59b authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

Btrfs: rename btrfs_sysfs_remove_one to btrfs_sysfs_remove_mounted 



Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 96f3136e

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -4005,7 +4005,7 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans, 
int btrfs_init_sysfs(void);

void btrfs_exit_sysfs(void);

int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info);

void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info);

void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info);



/* xattr.c */

ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size);

fs/btrfs/disk-io.c

+2 −2
Original line number Diff line number Diff line
@@ -3113,7 +3113,7 @@ fail_cleaner: 
	filemap_write_and_wait(fs_info->btree_inode->i_mapping);



fail_sysfs:

	btrfs_sysfs_remove_one(fs_info);

	btrfs_sysfs_remove_mounted(fs_info);



fail_fsdev_sysfs:

	btrfs_sysfs_remove_fsid(fs_info->fs_devices);
@@ -3788,7 +3788,7 @@ void close_ctree(struct btrfs_root *root) 
		       percpu_counter_sum(&fs_info->delalloc_bytes));

	}



	btrfs_sysfs_remove_one(fs_info);

	btrfs_sysfs_remove_mounted(fs_info);

	btrfs_sysfs_remove_fsid(fs_info->fs_devices);



	btrfs_free_fs_roots(fs_info);

fs/btrfs/sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs) 
	}

}



void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)

void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info)

{

	btrfs_reset_fs_info_ptr(fs_info);
@@ -776,7 +776,7 @@ int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info) 


	return 0;

failure:

	btrfs_sysfs_remove_one(fs_info);

	btrfs_sysfs_remove_mounted(fs_info);

	return error;

}