]> asedeno.scripts.mit.edu Git - linux.git/blobdiff - fs/btrfs/sysfs.c
Btrfs: fix race between using extent maps and merging them
[linux.git] / fs / btrfs / sysfs.c
index eac0155bf8c7765a2a66848e7674d86cca0cefb6..7436422194da32503d87aea85cf3d116f16eb78a 100644 (file)
@@ -366,6 +366,39 @@ static ssize_t btrfs_discardable_extents_show(struct kobject *kobj,
 }
 BTRFS_ATTR(discard, discardable_extents, btrfs_discardable_extents_show);
 
+static ssize_t btrfs_discard_bitmap_bytes_show(struct kobject *kobj,
+                                              struct kobj_attribute *a,
+                                              char *buf)
+{
+       struct btrfs_fs_info *fs_info = discard_to_fs_info(kobj);
+
+       return snprintf(buf, PAGE_SIZE, "%lld\n",
+                       fs_info->discard_ctl.discard_bitmap_bytes);
+}
+BTRFS_ATTR(discard, discard_bitmap_bytes, btrfs_discard_bitmap_bytes_show);
+
+static ssize_t btrfs_discard_bytes_saved_show(struct kobject *kobj,
+                                             struct kobj_attribute *a,
+                                             char *buf)
+{
+       struct btrfs_fs_info *fs_info = discard_to_fs_info(kobj);
+
+       return snprintf(buf, PAGE_SIZE, "%lld\n",
+               atomic64_read(&fs_info->discard_ctl.discard_bytes_saved));
+}
+BTRFS_ATTR(discard, discard_bytes_saved, btrfs_discard_bytes_saved_show);
+
+static ssize_t btrfs_discard_extent_bytes_show(struct kobject *kobj,
+                                              struct kobj_attribute *a,
+                                              char *buf)
+{
+       struct btrfs_fs_info *fs_info = discard_to_fs_info(kobj);
+
+       return snprintf(buf, PAGE_SIZE, "%lld\n",
+                       fs_info->discard_ctl.discard_extent_bytes);
+}
+BTRFS_ATTR(discard, discard_extent_bytes, btrfs_discard_extent_bytes_show);
+
 static ssize_t btrfs_discard_iops_limit_show(struct kobject *kobj,
                                             struct kobj_attribute *a,
                                             char *buf)
@@ -459,6 +492,9 @@ BTRFS_ATTR_RW(discard, max_discard_size, btrfs_discard_max_discard_size_show,
 static const struct attribute *discard_debug_attrs[] = {
        BTRFS_ATTR_PTR(discard, discardable_bytes),
        BTRFS_ATTR_PTR(discard, discardable_extents),
+       BTRFS_ATTR_PTR(discard, discard_bitmap_bytes),
+       BTRFS_ATTR_PTR(discard, discard_bytes_saved),
+       BTRFS_ATTR_PTR(discard, discard_extent_bytes),
        BTRFS_ATTR_PTR(discard, iops_limit),
        BTRFS_ATTR_PTR(discard, kbps_limit),
        BTRFS_ATTR_PTR(discard, max_discard_size),
@@ -1116,29 +1152,117 @@ int btrfs_sysfs_rm_device_link(struct btrfs_fs_devices *fs_devices,
        if (!fs_devices->devices_kobj)
                return -EINVAL;
 
-       if (one_device && one_device->bdev) {
-               disk = one_device->bdev->bd_part;
-               disk_kobj = &part_to_dev(disk)->kobj;
+       if (one_device) {
+               if (one_device->bdev) {
+                       disk = one_device->bdev->bd_part;
+                       disk_kobj = &part_to_dev(disk)->kobj;
+                       sysfs_remove_link(fs_devices->devices_kobj,
+                                         disk_kobj->name);
+               }
 
-               sysfs_remove_link(fs_devices->devices_kobj, disk_kobj->name);
-       }
+               kobject_del(&one_device->devid_kobj);
+               kobject_put(&one_device->devid_kobj);
+
+               wait_for_completion(&one_device->kobj_unregister);
 
-       if (one_device)
                return 0;
+       }
 
-       list_for_each_entry(one_device,
-                       &fs_devices->devices, dev_list) {
-               if (!one_device->bdev)
-                       continue;
-               disk = one_device->bdev->bd_part;
-               disk_kobj = &part_to_dev(disk)->kobj;
+       list_for_each_entry(one_device, &fs_devices->devices, dev_list) {
+
+               if (one_device->bdev) {
+                       disk = one_device->bdev->bd_part;
+                       disk_kobj = &part_to_dev(disk)->kobj;
+                       sysfs_remove_link(fs_devices->devices_kobj,
+                                         disk_kobj->name);
+               }
+               kobject_del(&one_device->devid_kobj);
+               kobject_put(&one_device->devid_kobj);
 
-               sysfs_remove_link(fs_devices->devices_kobj, disk_kobj->name);
+               wait_for_completion(&one_device->kobj_unregister);
        }
 
        return 0;
 }
 
+static ssize_t btrfs_devinfo_in_fs_metadata_show(struct kobject *kobj,
+                                                struct kobj_attribute *a,
+                                                char *buf)
+{
+       int val;
+       struct btrfs_device *device = container_of(kobj, struct btrfs_device,
+                                                  devid_kobj);
+
+       val = !!test_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &device->dev_state);
+
+       return snprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+BTRFS_ATTR(devid, in_fs_metadata, btrfs_devinfo_in_fs_metadata_show);
+
+static ssize_t btrfs_sysfs_missing_show(struct kobject *kobj,
+                                       struct kobj_attribute *a, char *buf)
+{
+       int val;
+       struct btrfs_device *device = container_of(kobj, struct btrfs_device,
+                                                  devid_kobj);
+
+       val = !!test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state);
+
+       return snprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+BTRFS_ATTR(devid, missing, btrfs_sysfs_missing_show);
+
+static ssize_t btrfs_devinfo_replace_target_show(struct kobject *kobj,
+                                                struct kobj_attribute *a,
+                                                char *buf)
+{
+       int val;
+       struct btrfs_device *device = container_of(kobj, struct btrfs_device,
+                                                  devid_kobj);
+
+       val = !!test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state);
+
+       return snprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+BTRFS_ATTR(devid, replace_target, btrfs_devinfo_replace_target_show);
+
+static ssize_t btrfs_devinfo_writeable_show(struct kobject *kobj,
+                                           struct kobj_attribute *a, char *buf)
+{
+       int val;
+       struct btrfs_device *device = container_of(kobj, struct btrfs_device,
+                                                  devid_kobj);
+
+       val = !!test_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);
+
+       return snprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+BTRFS_ATTR(devid, writeable, btrfs_devinfo_writeable_show);
+
+static struct attribute *devid_attrs[] = {
+       BTRFS_ATTR_PTR(devid, in_fs_metadata),
+       BTRFS_ATTR_PTR(devid, missing),
+       BTRFS_ATTR_PTR(devid, replace_target),
+       BTRFS_ATTR_PTR(devid, writeable),
+       NULL
+};
+ATTRIBUTE_GROUPS(devid);
+
+static void btrfs_release_devid_kobj(struct kobject *kobj)
+{
+       struct btrfs_device *device = container_of(kobj, struct btrfs_device,
+                                                  devid_kobj);
+
+       memset(&device->devid_kobj, 0, sizeof(struct kobject));
+       complete(&device->kobj_unregister);
+}
+
+static struct kobj_type devid_ktype = {
+       .sysfs_ops      = &kobj_sysfs_ops,
+       .default_groups = devid_groups,
+       .release        = btrfs_release_devid_kobj,
+};
+
 int btrfs_sysfs_add_device_link(struct btrfs_fs_devices *fs_devices,
                                struct btrfs_device *one_device)
 {
@@ -1146,22 +1270,31 @@ int btrfs_sysfs_add_device_link(struct btrfs_fs_devices *fs_devices,
        struct btrfs_device *dev;
 
        list_for_each_entry(dev, &fs_devices->devices, dev_list) {
-               struct hd_struct *disk;
-               struct kobject *disk_kobj;
-
-               if (!dev->bdev)
-                       continue;
 
                if (one_device && one_device != dev)
                        continue;
 
-               disk = dev->bdev->bd_part;
-               disk_kobj = &part_to_dev(disk)->kobj;
+               if (dev->bdev) {
+                       struct hd_struct *disk;
+                       struct kobject *disk_kobj;
 
-               error = sysfs_create_link(fs_devices->devices_kobj,
-                                         disk_kobj, disk_kobj->name);
-               if (error)
+                       disk = dev->bdev->bd_part;
+                       disk_kobj = &part_to_dev(disk)->kobj;
+
+                       error = sysfs_create_link(fs_devices->devices_kobj,
+                                                 disk_kobj, disk_kobj->name);
+                       if (error)
+                               break;
+               }
+
+               init_completion(&dev->kobj_unregister);
+               error = kobject_init_and_add(&dev->devid_kobj, &devid_ktype,
+                                            fs_devices->devices_kobj, "%llu",
+                                            dev->devid);
+               if (error) {
+                       kobject_put(&dev->devid_kobj);
                        break;
+               }
        }
 
        return error;
@@ -1193,6 +1326,18 @@ void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices,
                                "sysfs: failed to create fsid for sprout");
 }
 
+void btrfs_sysfs_update_devid(struct btrfs_device *device)
+{
+       char tmp[24];
+
+       snprintf(tmp, sizeof(tmp), "%llu", device->devid);
+
+       if (kobject_rename(&device->devid_kobj, tmp))
+               btrfs_warn(device->fs_devices->fs_info,
+                          "sysfs: failed to update devid for %llu",
+                          device->devid);
+}
+
 /* /sys/fs/btrfs/ entry */
 static struct kset *btrfs_kset;