UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

md-cluster: metadata_update_finish: consistently use cmsg.raid_slot as le32 

As cmsg.raid_slot is le32, comparing for >0 is not meaningful.

So introduce cpu-endian 'raid_slot' and only assign to cmsg.raid_slot
when we know value is valid.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: NeilBrown <neilb@suse.com>
This commit is contained in:
NeilBrown 2015-10-16 13:48:35 +11:00
parent c2a06c38d9
commit ba2746b0fa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/md/md-cluster.c
View File

@ -847,20 +847,21 @@ static int metadata_update_finish(struct mddev *mddev)
struct cluster_msg cmsg; struct cluster_msg cmsg;
struct md_rdev *rdev; struct md_rdev *rdev;
int ret = 0; int ret = 0;
int raid_slot = -1;
memset(&cmsg, 0, sizeof(cmsg)); memset(&cmsg, 0, sizeof(cmsg));
cmsg.type = cpu_to_le32(METADATA_UPDATED); cmsg.type = cpu_to_le32(METADATA_UPDATED);
cmsg.raid_slot = -1;
/* Pick up a good active device number to send. /* Pick up a good active device number to send.
*/ */
rdev_for_each(rdev, mddev) rdev_for_each(rdev, mddev)
if (rdev->raid_disk > -1 && !test_bit(Faulty, &rdev->flags)) { if (rdev->raid_disk > -1 && !test_bit(Faulty, &rdev->flags)) {
cmsg.raid_slot = cpu_to_le32(rdev->desc_nr); raid_slot = rdev->desc_nr;
break; break;
} }
if (cmsg.raid_slot >= 0) if (raid_slot >= 0) {
cmsg.raid_slot = cpu_to_le32(raid_slot);
ret = __sendmsg(cinfo, &cmsg); ret = __sendmsg(cinfo, &cmsg);
else } else
pr_warn("md-cluster: No good device id found to send\n"); pr_warn("md-cluster: No good device id found to send\n");
unlock_comm(cinfo); unlock_comm(cinfo);
return ret; return ret;