summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorGeorge Spelvin <linux@horizon.com>2014-10-07 07:26:38 -0400
committerTejun Heo <tj@kernel.org>2014-10-07 17:10:00 -0400
commit1c40279960bcd7d52dbdf1d466b20d24b99176c8 (patch)
tree39035a38f06cf7c84bb246c1b3029986fbd83209 /drivers/ata
parent33fb0d01ce60fe4c0c12c4f0c134c5cdb818ac5a (diff)
downloadtalos-obmc-linux-1c40279960bcd7d52dbdf1d466b20d24b99176c8.tar.gz
talos-obmc-linux-1c40279960bcd7d52dbdf1d466b20d24b99176c8.zip
libata: Un-break ATA blacklist
lib/glob.c provides a new glob_match() function, with arguments in (pattern, string) order. It replaced a private function with arguments in (string, pattern) order, but I didn't swap the call site... The result was the entire ATA blacklist was effectively disabled. The lesson for today is "I f***ed up *how* badly *how* many months ago?", er, I mean "Nobody Tests RC Kernels On Legacy Hardware". This was not a subtle break, but it made it through an entire RC cycle unreported, presumably because all the people doing testing have full-featured hardware. (FWIW, the reason for the argument swap was because fnmatch() does it that way, and for a while implementing a full fnmatch() was being considered.) Fixes: 428ac5fc056e0 (libata: Use glob_match from lib/glob.c) Reported-by: Steven Honeyman <stevenhoneyman@gmail.com> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=71371#c21 Signed-off-by: George Spelvin <linux@horizon.com> Cc: <stable@vger.kernel.org> # 3.17 Tested-by: Steven Honeyman <stevenhoneyman@gmail.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index f785ae50a0ea..bea6d3745324 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4261,10 +4261,10 @@ static unsigned long ata_dev_blacklisted(const struct ata_device *dev)
ata_id_c_string(dev->id, model_rev, ATA_ID_FW_REV, sizeof(model_rev));
while (ad->model_num) {
- if (glob_match(model_num, ad->model_num)) {
+ if (glob_match(ad->model_num, model_num)) {
if (ad->model_rev == NULL)
return ad->horkage;
- if (glob_match(model_rev, ad->model_rev))
+ if (glob_match(ad->model_rev, model_rev))
return ad->horkage;
}
ad++;
OpenPOWER on IntegriCloud