On Tue, Jul 22, 2014 at 09:28:52PM -0600, Chris Murphy wrote:
>
> On Jul 22, 2014, at 8:52 PM, Eric Sandeen <sand...@redhat.com> wrote:
>
> > This one (your bug #4) was likely caused by:
> >
> > commit 99994cde9c59c2b8bb67d46d531b26cc73e39747
> > Author: Anand Jain <anand.j...@oracle.com>
> > Date: Tue Jun 3 11:36:00 2014 +0800
> >
> > btrfs: dev delete should remove sysfs entry
> >
> > and hopefully fixed by:
> >
> > commit 0bfaa9c5cb479cebc24979b384374fe47500b4c9
> > Author: Eric Sandeen <sand...@redhat.com>
> > Date: Mon Jul 7 12:34:49 2014 -0500
> >
> > btrfs: test for valid bdev before kobj removal in btrfs_rm_device
>
> OK good. Hopefully the first one is reverted or the second one is accepted
> before 3.16 is released, replace appears to be broken at the moment.
>
Looks that they are not the same one, since you didn't use a btrfs_rm_device,
As we just skip adding a sysfs entry for a missing device(dev->bdev is NULL), we
can do the same thing in removing a sysfs entry, could you please try this?
-liubo
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 7869936..12e5355 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -614,7 +614,7 @@ int btrfs_kobj_rm_device(struct btrfs_fs_info *fs_info,
if (!fs_info->device_dir_kobj)
return -EINVAL;
- if (one_device) {
+ if (one_device && one_device->bdev) {
disk = one_device->bdev->bd_part;
disk_kobj = &part_to_dev(disk)->kobj;
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
