Skip to contentSkip to conversation

bcache: fix error info in register_bcache()

PATCH In review Chao Yu 2 participants 2 messages May 19, 2021 bcache (block layer cache)

lore
Share & tools
lore

Chao Yu

author
#0 lore raw

PATCH 1/1 bcache: fix error info in register_bcache()

From: Chao Yu <[email protected]>

In register_bcache(), there are several cases we didn't set correct error info (return value and/or error message):
- if kzalloc() fails, it needs to return ENOMEM and print "cannot allocate memory";
- if register_cache() fails, it's better to propagate its return value rather than using default EINVAL.

---
 drivers/md/bcache/super.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/md/bcache/super.c +10 -3
index bea8c4429ae8..0a20ccf5a1db 100644
@@ -2620,8 +2620,11 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
 	if (SB_IS_BDEV(sb)) {
 		struct cached_dev *dc = kzalloc(sizeof(*dc), GFP_KERNEL);
 
-		if (!dc)
+		if (!dc) {
+			ret = -ENOMEM;
+			err = "cannot allocate memory";
 			goto out_put_sb_page;
+		}
 
 		mutex_lock(&bch_register_lock);
 		ret = register_bdev(sb, sb_disk, bdev, dc);
@@ -2632,11 +2635,15 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
 	} else {
 		struct cache *ca = kzalloc(sizeof(*ca), GFP_KERNEL);
 
-		if (!ca)
+		if (!ca) {
+			ret = -ENOMEM;
+			err = "cannot allocate memory";
 			goto out_put_sb_page;
+		}
 
 		/* blkdev_put() will be called in bch_cache_release() */
-		if (register_cache(sb, sb_disk, bdev, ca) != 0)
+		ret = register_cache(sb, sb_disk, bdev, ca);
+		if (ret)
 			goto out_free_sb;
 	}
 
Signature · 1 line
2.22.1
#1 lore raw
Quoted 10 lines · Chao Yu

From: Chao Yu <[email protected]>

In register_bcache(), there are several cases we didn't set correct error info (return value and/or error message):
- if kzalloc() fails, it needs to return ENOMEM and print "cannot allocate memory";
- if register_cache() fails, it's better to propagate its return value rather than using default EINVAL.

Will add it to my test queue.

Thanks.

Coly Li

Quoted 40 lines
---
 drivers/md/bcache/super.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/md/bcache/super.c +10 -3
index bea8c4429ae8..0a20ccf5a1db 100644
@@ -2620,8 +2620,11 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
 	if (SB_IS_BDEV(sb)) {
 		struct cached_dev *dc = kzalloc(sizeof(*dc), GFP_KERNEL);
 
-		if (!dc)
+		if (!dc) {
+			ret = -ENOMEM;
+			err = "cannot allocate memory";
 			goto out_put_sb_page;
+		}
 
 		mutex_lock(&bch_register_lock);
 		ret = register_bdev(sb, sb_disk, bdev, dc);
@@ -2632,11 +2635,15 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
 	} else {
 		struct cache *ca = kzalloc(sizeof(*ca), GFP_KERNEL);
 
-		if (!ca)
+		if (!ca) {
+			ret = -ENOMEM;
+			err = "cannot allocate memory";
 			goto out_put_sb_page;
+		}
 
 		/* blkdev_put() will be called in bch_cache_release() */
-		if (register_cache(sb, sb_disk, bdev, ca) != 0)
+		ret = register_cache(sb, sb_disk, bdev, ca);
+		if (ret)
 			goto out_free_sb;
 	}