From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: clm@fb.com, dsterba@suse.cz
Subject: [PATCH 04/23] Btrfs: rename btrfs_kobj_rm_device to btrfs_sysfs_rm_device_link
Date: Fri, 14 Aug 2015 18:32:49 +0800 [thread overview]
Message-ID: <1439548388-29686-5-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1439548388-29686-1-git-send-email-anand.jain@oracle.com>
---
fs/btrfs/dev-replace.c | 2 +-
fs/btrfs/sysfs.c | 6 +++---
fs/btrfs/sysfs.h | 2 +-
fs/btrfs/volumes.c | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index c1bf0d6..6eb9324 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -587,7 +587,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
mutex_unlock(&uuid_mutex);
/* replace the sysfs entry */
- btrfs_kobj_rm_device(fs_info->fs_devices, src_device);
+ btrfs_sysfs_rm_device_link(fs_info->fs_devices, src_device);
btrfs_rm_dev_replace_free_srcdev(fs_info, src_device);
/* write back the superblocks */
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index df67f6b..52319d1 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -557,7 +557,7 @@ void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info)
addrm_unknown_feature_attrs(fs_info, false);
sysfs_remove_group(&fs_info->fs_devices->super_kobj, &btrfs_feature_attr_group);
sysfs_remove_files(&fs_info->fs_devices->super_kobj, btrfs_attrs);
- btrfs_kobj_rm_device(fs_info->fs_devices, NULL);
+ btrfs_sysfs_rm_device_link(fs_info->fs_devices, NULL);
}
const char * const btrfs_feature_set_names[3] = {
@@ -637,7 +637,7 @@ static void init_feature_attrs(void)
/* when one_device is NULL, it removes all device links */
-int btrfs_kobj_rm_device(struct btrfs_fs_devices *fs_devices,
+int btrfs_sysfs_rm_device_link(struct btrfs_fs_devices *fs_devices,
struct btrfs_device *one_device)
{
struct hd_struct *disk;
@@ -750,7 +750,7 @@ int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info)
error = sysfs_create_files(super_kobj, btrfs_attrs);
if (error) {
- btrfs_kobj_rm_device(fs_devs, NULL);
+ btrfs_sysfs_rm_device_link(fs_devs, NULL);
return error;
}
diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h
index 6529680..9c09522 100644
--- a/fs/btrfs/sysfs.h
+++ b/fs/btrfs/sysfs.h
@@ -84,7 +84,7 @@ extern struct kobj_type space_info_ktype;
extern struct kobj_type btrfs_raid_ktype;
int btrfs_sysfs_add_device_link(struct btrfs_fs_devices *fs_devices,
struct btrfs_device *one_device);
-int btrfs_kobj_rm_device(struct btrfs_fs_devices *fs_devices,
+int btrfs_sysfs_rm_device_link(struct btrfs_fs_devices *fs_devices,
struct btrfs_device *one_device);
int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs,
struct kobject *parent);
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 18ea1eb..4c7c344 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1801,7 +1801,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path)
if (device->bdev) {
device->fs_devices->open_devices--;
/* remove sysfs entry */
- btrfs_kobj_rm_device(root->fs_info->fs_devices, device);
+ btrfs_sysfs_rm_device_link(root->fs_info->fs_devices, device);
}
call_rcu(&device->rcu, free_device);
@@ -1971,7 +1971,7 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
WARN_ON(!tgtdev);
mutex_lock(&fs_info->fs_devices->device_list_mutex);
- btrfs_kobj_rm_device(fs_info->fs_devices, tgtdev);
+ btrfs_sysfs_rm_device_link(fs_info->fs_devices, tgtdev);
if (tgtdev->bdev) {
btrfs_scratch_superblock(tgtdev);
@@ -2388,7 +2388,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
error_trans:
btrfs_end_transaction(trans, root);
rcu_string_free(device->name);
- btrfs_kobj_rm_device(root->fs_info->fs_devices, device);
+ btrfs_sysfs_rm_device_link(root->fs_info->fs_devices, device);
kfree(device);
error:
blkdev_put(bdev, FMODE_EXCL);
--
2.4.1
next prev parent reply other threads:[~2015-08-14 10:33 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-14 10:32 [PATCH 00/23] btrfs device related patch set Anand Jain
2015-08-14 10:32 ` [PATCH 01/23] Btrfs: rename btrfs_sysfs_add_one to btrfs_sysfs_add_mounted Anand Jain
2015-08-14 10:32 ` [PATCH 02/23] Btrfs: rename btrfs_sysfs_remove_one to btrfs_sysfs_remove_mounted Anand Jain
2015-08-14 10:32 ` [PATCH 03/23] Btrfs: rename btrfs_kobj_add_device to btrfs_sysfs_add_device_link Anand Jain
2015-08-14 10:32 ` Anand Jain [this message]
2015-08-14 10:32 ` [PATCH 05/23] Btrfs: rename super_kobj to fsid_kobj Anand Jain
2015-08-14 10:32 ` [PATCH 06/23] Btrfs: SB read failure should return EIO for __bread failure Anand Jain
2015-08-14 10:32 ` [PATCH 07/23] Btrfs: __btrfs_std_error() logic should be consistent w/out CONFIG_PRINTK defined Anand Jain
2015-08-14 10:32 ` [PATCH 08/23] Btrfs: device delete by devid Anand Jain
2015-10-06 9:38 ` [PATCH V4 08/23] Btrfs: Introduce " Anand Jain
2015-08-14 10:32 ` [PATCH 09/23] Btrfs: move check for min number of devices to a function Anand Jain
2015-08-14 10:32 ` [PATCH 10/23] Btrfs: rename btrfs_dev_replace_find_srcdev() Anand Jain
2015-08-14 10:32 ` [PATCH 11/23] Btrfs: use BTRFS_ERROR_DEV_MISSING_NOT_FOUND when missing device is not found Anand Jain
2015-08-14 10:32 ` [PATCH 12/23] Btrfs: use btrfs_find_device_by_user_input() Anand Jain
2015-08-14 10:32 ` [PATCH 13/23] Btrfs: add btrfs_read_dev_one_super() to read one specific SB Anand Jain
2015-08-14 10:32 ` [PATCH 14/23] Btrfs: fix btrfs_scratch_superblock() with fixes from device delete Anand Jain
2015-08-14 10:33 ` [PATCH 15/23] Btrfs: use btrfs_scratch_superblock() in btrfs_rm_device() Anand Jain
2015-08-14 10:33 ` [PATCH 16/23] Btrfs: device path change must be logged Anand Jain
2015-10-01 13:40 ` David Sterba
2015-10-01 13:47 ` Anand Jain
2015-10-05 8:50 ` Anand Jain
2015-08-14 10:33 ` [PATCH 17/23] Btrfs: kernel operation should come after user input has been verified Anand Jain
2015-08-14 10:33 ` [PATCH 18/23] Btrfs: check device_path in btrfs_find_device_by_user_input() Anand Jain
2015-08-14 10:33 ` [PATCH 19/23] Btrfs: avoid user cli usage error logging into the sys log Anand Jain
2015-08-14 10:33 ` [PATCH 20/23] Btrfs: move device close to btrfs_close_one_device Anand Jain
2015-08-14 10:33 ` [PATCH 21/23] Btrfs: fix fs logging for multi device Anand Jain
2015-10-01 13:45 ` David Sterba
2015-10-01 13:48 ` Anand Jain
2015-08-14 10:33 ` [PATCH 22/23] Btrfs: move kobj stuff out of dev_replace lock range Anand Jain
2015-08-14 10:33 ` [PATCH 23/23] Btrfs: allow -o rw,degraded for single group profile Anand Jain
2015-09-29 14:34 ` [PATCH 00/23] btrfs device related patch set David Sterba
2015-09-29 22:10 ` Anand Jain
2015-09-30 15:05 ` David Sterba
2015-10-01 14:42 ` David Sterba
2015-10-01 15:00 ` Anand Jain
2015-10-01 16:17 ` David Sterba
2015-10-02 8:07 ` Anand Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439548388-29686-5-git-send-email-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=clm@fb.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).