diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-09-16 14:59:20 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-09-16 14:59:20 -0400 |
| commit | 16a587d55cb721f6f36dd66c0d58f464accd4ed2 (patch) | |
| tree | cd98bd6ecf1e80ea3c6c40fe096c8b1d8b89b4e8 | |
| parent | fb3344eba0b58a3829bba3d3e025a4c4a5c5c008 (diff) | |
| download | longterm-queue-5.2-16a587d55cb721f6f36dd66c0d58f464accd4ed2.tar.gz | |
btrfs: dir vs. link fcn rename
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/btrfs-sysfs-use-NOFS-for-device-creation.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/queue/btrfs-sysfs-use-NOFS-for-device-creation.patch b/queue/btrfs-sysfs-use-NOFS-for-device-creation.patch index d64b2c9d..fb36ed6b 100644 --- a/queue/btrfs-sysfs-use-NOFS-for-device-creation.patch +++ b/queue/btrfs-sysfs-use-NOFS-for-device-creation.patch @@ -1,4 +1,4 @@ -From a47bd78d0c44621efb98b525d04d60dc4d1a79b0 Mon Sep 17 00:00:00 2001 +From 0b9c350be3c28d6ea910693d1dc4b83b8e2afdc9 Mon Sep 17 00:00:00 2001 From: Josef Bacik <josef@toxicpanda.com> Date: Tue, 21 Jul 2020 10:17:50 -0400 Subject: [PATCH] btrfs: sysfs: use NOFS for device creation @@ -153,10 +153,10 @@ Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c -index 38c0b95e0e7f..104c80caaa74 100644 +index 2f078b77fe14..f27ca6c6ea66 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c -@@ -1278,7 +1278,9 @@ int btrfs_sysfs_add_devices_dir(struct btrfs_fs_devices *fs_devices, +@@ -780,7 +780,9 @@ int btrfs_sysfs_add_device_link(struct btrfs_fs_devices *fs_devices, { int error = 0; struct btrfs_device *dev; @@ -164,11 +164,11 @@ index 38c0b95e0e7f..104c80caaa74 100644 + nofs_flag = memalloc_nofs_save(); list_for_each_entry(dev, &fs_devices->devices, dev_list) { - - if (one_device && one_device != dev) -@@ -1306,6 +1308,7 @@ int btrfs_sysfs_add_devices_dir(struct btrfs_fs_devices *fs_devices, + struct hd_struct *disk; + struct kobject *disk_kobj; +@@ -799,6 +801,7 @@ int btrfs_sysfs_add_device_link(struct btrfs_fs_devices *fs_devices, + if (error) break; - } } + memalloc_nofs_restore(nofs_flag); |