md: Fix compilation warning

Remove the if statement around the calls to sysfs_link_rdev() to avoid
the compilation warnings:

warning: suggest braces around empty body in an ‘if’ statement

when compiling with W=1. For the call to sysfs_create_link() generating
the same warning, use the err variable to store the function result,
avoiding triggering another warning as the function is declared
as 'warn_unused_result'.

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Song Liu <songliubraving@fb.com>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index fc33f2f8a4153fade441bc508d1a2701facdf14b..9d740e4181ff4ff3a46b44025c46287cf1ee28ed 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2469,8 +2469,8 @@ static int bind_rdev_to_array(struct md_rdev *rdev, struct mddev *mddev)
                goto fail;
 
        ko = &part_to_dev(rdev->bdev->bd_part)->kobj;
-       if (sysfs_create_link(&rdev->kobj, ko, "block"))
-               /* failure here is OK */;
+       /* failure here is OK */
+       err = sysfs_create_link(&rdev->kobj, ko, "block");
        rdev->sysfs_state = sysfs_get_dirent_safe(rdev->kobj.sd, "state");
        rdev->sysfs_unack_badblocks =
                sysfs_get_dirent_safe(rdev->kobj.sd, "unacknowledged_bad_blocks");
@@ -3238,8 +3238,8 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len)
                        return err;
                } else
                        sysfs_notify_dirent_safe(rdev->sysfs_state);
-               if (sysfs_link_rdev(rdev->mddev, rdev))
-                       /* failure here is OK */;
+               /* failure here is OK */;
+               sysfs_link_rdev(rdev->mddev, rdev);
                /* don't wakeup anyone, leave that to userspace. */
        } else {
                if (slot >= rdev->mddev->raid_disks &&
@@ -9113,8 +9113,8 @@ static int remove_and_add_spares(struct mddev *mddev,
                        rdev->recovery_offset = 0;
                }
                if (mddev->pers->hot_add_disk(mddev, rdev) == 0) {
-                       if (sysfs_link_rdev(mddev, rdev))
-                               /* failure here is OK */;
+                       /* failure here is OK */
+                       sysfs_link_rdev(mddev, rdev);
                        if (!test_bit(Journal, &rdev->flags))
                                spares++;
                        md_new_event(mddev);