diff options
author | KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> | 2009-12-14 21:01:15 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 11:53:34 -0500 |
commit | ca54cb8c9eb38095dc420b73c6380ce1dbeb10fa (patch) | |
tree | 35b5ba777b962e95039521d912d926a9372b2e8f /drivers/scsi/ipr.c | |
parent | 925ede0bf4ecef96fc2d939b16619530111aa16e (diff) |
Subject: Re: [PATCH] strstrip incorrectly marked __must_check
Recently, We marked strstrip() as must_check. because it was frequently
misused and it should be checked. However, we found one exception.
scsi/ipr.c intentionally ignore return value of strstrip. Because it
wishes to keep the whitespace at the beginning.
Thus we need to keep with and without checked whitespace trim function.
This patch adds a new strim() and changes ipr.c to use it.
[akpm@linux-foundation.org: coding-style fixes]
Suggested-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi/ipr.c')
-rw-r--r-- | drivers/scsi/ipr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 206c2fa8c1b..8643f508936 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -1333,7 +1333,7 @@ static void ipr_log_enhanced_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg, | |||
1333 | 1333 | ||
1334 | error = &hostrcb->hcam.u.error.u.type_17_error; | 1334 | error = &hostrcb->hcam.u.error.u.type_17_error; |
1335 | error->failure_reason[sizeof(error->failure_reason) - 1] = '\0'; | 1335 | error->failure_reason[sizeof(error->failure_reason) - 1] = '\0'; |
1336 | strstrip(error->failure_reason); | 1336 | strim(error->failure_reason); |
1337 | 1337 | ||
1338 | ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason, | 1338 | ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason, |
1339 | be32_to_cpu(hostrcb->hcam.u.error.prc)); | 1339 | be32_to_cpu(hostrcb->hcam.u.error.prc)); |
@@ -1359,7 +1359,7 @@ static void ipr_log_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg, | |||
1359 | 1359 | ||
1360 | error = &hostrcb->hcam.u.error.u.type_07_error; | 1360 | error = &hostrcb->hcam.u.error.u.type_07_error; |
1361 | error->failure_reason[sizeof(error->failure_reason) - 1] = '\0'; | 1361 | error->failure_reason[sizeof(error->failure_reason) - 1] = '\0'; |
1362 | strstrip(error->failure_reason); | 1362 | strim(error->failure_reason); |
1363 | 1363 | ||
1364 | ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason, | 1364 | ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason, |
1365 | be32_to_cpu(hostrcb->hcam.u.error.prc)); | 1365 | be32_to_cpu(hostrcb->hcam.u.error.prc)); |