Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQu Wenruo <wqu@suse.com>2019-12-23 17:49:41 +0800
committerQu Wenruo <wqu@suse.com>2019-12-23 17:49:41 +0800
commit4b8f2cfb1c518b26546aede125b790ffa8ec71df (patch)
tree316de2e77a9c51846555149777b93e509faad313
parentb30ae9e2721cbe64e99dae1353b9b944584985ea (diff)
RefreshSLE15
patches.suse/0001-btrfs-harden-agaist-duplicate-fsid-on-scanned-device.patch. Fix a backport error where the function still returns int other than pointer in newer kernel. suse-commit: 752785efffa0f7688abaff41c4fa8e61aff5ae5e
-rw-r--r--fs/btrfs/volumes.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 375104e4582d..6e81bf31e0a6 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -651,7 +651,7 @@ static noinline int device_list_add(const char *path,
path_bdev = lookup_bdev(path);
if (IS_ERR(path_bdev)) {
mutex_unlock(&fs_devices->device_list_mutex);
- return ERR_CAST(path_bdev);
+ return PTR_ERR(path_bdev);
}
if (device->bdev != path_bdev) {
@@ -661,7 +661,7 @@ static noinline int device_list_add(const char *path,
"duplicate device fsid:devid for %pU:%llu old:%s new:%s",
disk_super->fsid, devid,
rcu_str_deref(device->name), path);
- return ERR_PTR(-EEXIST);
+ return -EEXIST;
}
bdput(path_bdev);
btrfs_info_in_rcu(device->fs_info,