iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md: 2 fixes for 3.5-rc

Browse Source 
One sparse-warning fix, one bigfix for 3.4-stable
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQIVAwUAT86Oqjnsnt1WYoG5AQJ9rhAAuLVImkvxtHHMM7j2E8ZTQ1pWT6JRf6qC
 Rsz/s41olPwSEVRuLXpZrle/dSN2l1Ys49FR2u6m+96lM0At2JlkML/Sc4Gszr0g
 Oeo8FN+Rv/Sv6Chv7MuWp0z0WOs3ruIR3AYQIo+jnaVzZLLQ2HRN8wupjvpCIZyk
 WdPu6t/9G+OtnkFWCC3FDEIyqpghg1TcoK93b1eRFD/ZoPV8yDJ9bba//fDesVVI
 OhvUJPqeJ/ow+sA1MzyLhKB6CLPmEob0qxi8++CdnTfx8fwnkYNKlgsxf0WQ8JQ5
 GSClKNUpki0yiYWJR6pJrv6+e6WbesX1DriRSRODJLKls/bQKnskaxGx4DUa73BM
 DkOUsALfaTfGD5XiXgEjTU2HR+codiqvDavQjWOlHWgwIKB2MYQWIwFLK/T2RSdC
 5f30IiM6kHJMZS3lVP2kjfXAfQ10kiTBg7E6btzCO3aso84yxr6Er65skdnlIi5r
 q1z7FCnQimfZYjlbuR8EUtdxHdGZkSQbtZ5E7X9dvmUpFstvgGGPr/SuAP3r87kM
 LbyRSoDpGk8dXZ5/epY+IKCQGsFZIeTlg+eonjSuVNN8Anr3WAE1VeRmLBQilnXk
 hGDLKAZ4v9YwRJWqoY3hewtpcYhCMqNGGk4hPKmJuh37OTOWFQl8sXVk2Pqzy1ap
 uIP66qrvvI0=
 =VrYL
 -----END PGP SIGNATURE-----

Merge tag 'md-3.5-fixes' of git://neil.brown.name/md

Pull two md fixes from NeilBrown:
 "One sparse-warning fix, one bugfix for 3.4-stable"

* tag 'md-3.5-fixes' of git://neil.brown.name/md:
  md: raid1/raid10: fix problem with merge_bvec_fn
  lib/raid6: fix sparse warnings in recovery functions
This commit is contained in:
Linus Torvalds 2012-06-06 09:49:28 -07:00
commit 374916ed16
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/md/raid1.c
View File

@ -2550,6 +2550,7 @@ static struct r1conf *setup_conf(struct mddev *mddev)
err = -EINVAL; err = -EINVAL;
spin_lock_init(&conf->device_lock); spin_lock_init(&conf->device_lock);
rdev_for_each(rdev, mddev) { rdev_for_each(rdev, mddev) {
struct request_queue *q;
int disk_idx = rdev->raid_disk; int disk_idx = rdev->raid_disk;
if (disk_idx >= mddev->raid_disks if (disk_idx >= mddev->raid_disks
|| disk_idx < 0) || disk_idx < 0)
@ -2562,6 +2563,9 @@ static struct r1conf *setup_conf(struct mddev *mddev)
if (disk->rdev) if (disk->rdev)
goto abort; goto abort;
disk->rdev = rdev; disk->rdev = rdev;
q = bdev_get_queue(rdev->bdev);
if (q->merge_bvec_fn)
mddev->merge_check_needed = 1;
disk->head_position = 0; disk->head_position = 0;
} }

4
drivers/md/raid10.c
View File

@ -3475,6 +3475,7 @@ static int run(struct mddev *mddev)
rdev_for_each(rdev, mddev) { rdev_for_each(rdev, mddev) {
long long diff; long long diff;
struct request_queue *q;
disk_idx = rdev->raid_disk; disk_idx = rdev->raid_disk;
if (disk_idx < 0) if (disk_idx < 0)
@ -3493,6 +3494,9 @@ static int run(struct mddev *mddev)
goto out_free_conf; goto out_free_conf;
disk->rdev = rdev; disk->rdev = rdev;
} }
q = bdev_get_queue(rdev->bdev);
if (q->merge_bvec_fn)
mddev->merge_check_needed = 1;
diff = (rdev->new_data_offset - rdev->data_offset); diff = (rdev->new_data_offset - rdev->data_offset);
if (!mddev->reshape_backwards) if (!mddev->reshape_backwards)
diff = -diff; diff = -diff;

7
lib/raid6/recov.c
View File

@ -22,8 +22,8 @@
#include <linux/raid/pq.h> #include <linux/raid/pq.h>
/* Recover two failed data blocks. */ /* Recover two failed data blocks. */
void raid6_2data_recov_intx1(int disks, size_t bytes, int faila, int failb, static void raid6_2data_recov_intx1(int disks, size_t bytes, int faila,
void **ptrs) int failb, void **ptrs)
{ {
u8 *p, *q, *dp, *dq; u8 *p, *q, *dp, *dq;
u8 px, qx, db; u8 px, qx, db;
@ -66,7 +66,8 @@ void raid6_2data_recov_intx1(int disks, size_t bytes, int faila, int failb,
} }
/* Recover failure of one data block plus the P block */ /* Recover failure of one data block plus the P block */
void raid6_datap_recov_intx1(int disks, size_t bytes, int faila, void **ptrs) static void raid6_datap_recov_intx1(int disks, size_t bytes, int faila,
void **ptrs)
{ {
u8 *p, *q, *dq; u8 *p, *q, *dq;
const u8 *qmul; /* Q multiplier table */ const u8 *qmul; /* Q multiplier table */

7
lib/raid6/recov_ssse3.c
View File

@ -19,8 +19,8 @@ static int raid6_has_ssse3(void)
boot_cpu_has(X86_FEATURE_SSSE3); boot_cpu_has(X86_FEATURE_SSSE3);
} }
void raid6_2data_recov_ssse3(int disks, size_t bytes, int faila, int failb, static void raid6_2data_recov_ssse3(int disks, size_t bytes, int faila,
void **ptrs) int failb, void **ptrs)
{ {
u8 *p, *q, *dp, *dq; u8 *p, *q, *dp, *dq;
const u8 *pbmul; /* P multiplier table for B data */ const u8 *pbmul; /* P multiplier table for B data */
@ -194,7 +194,8 @@ void raid6_2data_recov_ssse3(int disks, size_t bytes, int faila, int failb,
} }
void raid6_datap_recov_ssse3(int disks, size_t bytes, int faila, void **ptrs) static void raid6_datap_recov_ssse3(int disks, size_t bytes, int faila,
void **ptrs)
{ {
u8 *p, *q, *dq; u8 *p, *q, *dq;
const u8 *qmul; /* Q multiplier table */ const u8 *qmul; /* Q multiplier table */