/fs/partition/check.c : fix return value warning (V2)
PATCH 1/2 /fs/partition/check.c : fix return value warning (V2)
fs/partitions/check.c:381: warning: ignoring return value of ___device_add___,
declared with attribute warn_unused_result
Signed-off-by Abdel Benamrouche <[email protected]>
--- fs/partitions/check.c | 25 ++++++++++++++++++++----- include/linux/genhd.h | 2 +- 2 files changed, 21 insertions(+), 6 deletions(-)
fs/partitions/check.c +20 -5
@@ -344,18 +344,18 @@ static ssize_t whole_disk_show(struct device *dev, static DEVICE_ATTR(whole_disk, S_IRUSR | S_IRGRP | S_IROTH, whole_disk_show, NULL); -void add_partition (struct gendisk *disk,int part,sector_t start,sector_t len,int flags) +int add_partition (struct gendisk *disk,int part,sector_t start,sector_t len,int flags) {struct hd_struct *p;int err; p =kzalloc (sizeof (*p),GFP_KERNEL );if (!p) -return ; +return -ENOMEM ;if (!init_part_stats (p)) {kfree (p); -return ; +return -ENOMEM ; } p->start_sect = start; p->nr_sects = len;
@@ -378,15 +378,30 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len,/* delay uevent until 'holders' subdir is created */ p->dev.uevent_suppress =1 ; -device_add (&p->dev); + err =device_add (&p->dev); +if (err) + goto out1;partition_sysfs_add_subdir (p); p->dev.uevent_suppress =0 ; -if (flags &ADDPART_FLAG_WHOLEDISK ) +if (flags &ADDPART_FLAG_WHOLEDISK ) { err =device_create_file (&p->dev, &dev_attr_whole_disk); +if (err) + goto out2; + }/* suppress uevent if the disk supresses it */ if (!disk->dev.uevent_suppress)kobject_uevent (&p->dev.kobj,KOBJ_ADD ); + +return 0 ; + +out2: +device_del (&p->dev); +out1: +put_device (&p->dev); +free_part_stats (p); +kfree (p); +return err; }/* Not exported, helper to add_disk(). */
include/linux/genhd.h +1 -1
@@ -529,7 +529,7 @@ extern dev_t blk_lookup_devt(const char *name);extern char *disk_name (struct gendisk *hd,int part,char *buf);extern int rescan_partitions (struct gendisk *disk,struct block_device *bdev); -extern void add_partition (struct gendisk *,int ,sector_t ,sector_t ,int ); +extern int __must_check add_partition (struct gendisk *,int ,sector_t ,sector_t ,int );extern void delete_partition (struct gendisk *,int );extern void printk_all_partitions (void );
Signature · 1 line
1.5.4.3