linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.cz, clm@fb.com
Subject: [PATCH 03/12] Btrfs: sysfs: fix, undo sysfs device links
Date: Sun,  1 Feb 2015 16:01:33 +0800	[thread overview]
Message-ID: <1422777702-12584-4-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1422777702-12584-1-git-send-email-anand.jain@oracle.com>

Theoritically need to remove the device links attributes, but since its entire device
kobject was removed, so there wasn't any issue of about it. Just do it nicely.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 fs/btrfs/sysfs.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 68dcd17..adfac3e 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -522,6 +522,7 @@ void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)
 		kobject_del(fs_info->space_info_kobj);
 		kobject_put(fs_info->space_info_kobj);
 	}
+	btrfs_kobj_rm_device(fs_info, NULL);
 	kobject_del(fs_info->device_dir_kobj);
 	kobject_put(fs_info->device_dir_kobj);
 	addrm_unknown_feature_attrs(fs_info, false);
@@ -604,6 +605,8 @@ static void init_feature_attrs(void)
 	}
 }
 
+/* when one_device is NULL, it removes all device links */
+
 int btrfs_kobj_rm_device(struct btrfs_fs_info *fs_info,
 		struct btrfs_device *one_device)
 {
@@ -621,6 +624,20 @@ int btrfs_kobj_rm_device(struct btrfs_fs_info *fs_info,
 						disk_kobj->name);
 	}
 
+	if (one_device)
+		return 0;
+
+	list_for_each_entry(one_device,
+			&fs_info->fs_devices->devices, dev_list) {
+		if (!one_device->bdev)
+			continue;
+		disk = one_device->bdev->bd_part;
+		disk_kobj = &part_to_dev(disk)->kobj;
+
+		sysfs_remove_link(fs_info->device_dir_kobj,
+						disk_kobj->name);
+	}
+
 	return 0;
 }
 
-- 
1.9.1


  parent reply	other threads:[~2015-02-01  8:03 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-19 16:02 [PATCH 1/1] Btrfs: move super_kobj and device_dir_kobj from fs_info to btrfs_fs_devices Anand Jain
2015-01-23 16:35 ` David Sterba
2015-01-24 13:42 ` Anand Jain
2015-01-26  1:59 ` [PATCH 1/1] Btrfs: btrfs_release_super_kobj() should clean up the kobject data Anand Jain
2015-01-26 10:07 ` [PATCH 1/1] Btrfs: move super_kobj and device_dir_kobj from fs_info to btrfs_fs_devices Anand Jain
2015-02-01  8:01 ` [PATCH 00/12] provide frame work so that sysfs attributs from the fs_devices can be added Anand Jain
2015-02-01  8:01   ` [PATCH 01/12] Btrfs: sysfs: fix, btrfs_release_super_kobj() should to clean up the kobject data Anand Jain
2015-02-01  8:01   ` [PATCH 02/12] Btrfs: sysfs: fix, fs_info kobject_unregister has init_completion() twice Anand Jain
2015-02-01  8:01   ` Anand Jain [this message]
2015-02-01  8:01   ` [PATCH 04/12] Btrfs: sysfs: fix, kobject pointer clean up needed after kobject release Anand Jain
2015-02-01  8:01   ` [PATCH 05/12] Btrfc: sysfs: fix, check if device_dir_kobj is init before destroy Anand Jain
2015-02-01  8:01   ` [PATCH 06/12] Btrfs: sysfs: reorder the kobject creations Anand Jain
2015-02-01  8:01   ` [PATCH 07/12] Btrfs: sysfs: rename __btrfs_sysfs_remove_one to btrfs_sysfs_remove_fsid Anand Jain
2015-02-01  8:01   ` [PATCH 08/12] Btrfs: sysfs: introduce function btrfs_sysfs_add_fsid() to create sysfs fsid Anand Jain
2015-02-01  8:01   ` [PATCH 09/12] Btrfs: sysfs: let default_attrs be separate from the kset Anand Jain
2015-02-01  8:01   ` [PATCH 10/12] Btrfs: sysfs: separate device kobject and its attribute creation Anand Jain
2015-02-01  8:01   ` [PATCH 11/12] Btrfs: sysfs: move super_kobj and device_dir_kobj from fs_info to btrfs_fs_devices Anand Jain
2015-02-01  8:01   ` [PATCH 12/12] Btrfs: sysfs: add pointer to access fs_info from fs_devices Anand Jain
2015-02-01  8:02 ` [PATCH] Btrfs-progs: add regression tests for sysfs contents during btrfs device management 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=1422777702-12584-4-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).