From: Tomas Winkler <tomas.winkler@intel.com>
To: James Bottomley <James.Bottomley@hansenpartnership.com>
Cc: Christoph Hellwig <hch@lst.de>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
Tomas Winkler <tomas.winkler@intel.com>
Subject: [scsi 3/7 RESEND] scsi_debug: vfree is null safe so drop the check
Date: Tue, 28 Jul 2015 16:54:22 +0300 [thread overview]
Message-ID: <1438091666-18113-3-git-send-email-tomas.winkler@intel.com> (raw)
In-Reply-To: <1438091666-18113-1-git-send-email-tomas.winkler@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
---
drivers/scsi/scsi_debug.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index bbe04dae040c..e2c509e39765 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -4955,10 +4955,8 @@ bus_unreg:
dev_unreg:
root_device_unregister(pseudo_primary);
free_vm:
- if (map_storep)
- vfree(map_storep);
- if (dif_storep)
- vfree(dif_storep);
+ vfree(map_storep);
+ vfree(dif_storep);
vfree(fake_storep);
return ret;
@@ -4976,9 +4974,7 @@ static void __exit scsi_debug_exit(void)
bus_unregister(&pseudo_lld_bus);
root_device_unregister(pseudo_primary);
- if (dif_storep)
- vfree(dif_storep);
-
+ vfree(dif_storep);
vfree(fake_storep);
}
--
2.4.3
next prev parent reply other threads:[~2015-07-28 13:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-28 13:54 [scsi 1/7 RESEND] scsi_debug: define pr_fmt() for consistent logging Tomas Winkler
2015-07-28 13:54 ` [scsi 2/7 RESEND] scsi_debug: use SCSI_W_LUN_REPORT_LUNS instead of SAM2_WLUN_REPORT_LUNS; Tomas Winkler
2015-07-30 17:22 ` Martin K. Petersen
2015-07-28 13:54 ` Tomas Winkler [this message]
2015-07-30 17:22 ` [scsi 3/7 RESEND] scsi_debug: vfree is null safe so drop the check Martin K. Petersen
2015-07-28 13:54 ` [scsi 4/7 RESEND] scsi_debug: make dump_sector static Tomas Winkler
2015-07-30 17:22 ` Martin K. Petersen
2015-07-28 13:54 ` [scsi 5/7 RESEND] scsi_debug: schedule_resp fix input variable check Tomas Winkler
2015-07-30 17:23 ` Martin K. Petersen
2015-08-25 19:52 ` Ewan Milne
2015-08-25 21:03 ` Winkler, Tomas
2015-08-26 23:38 ` James Bottomley
2015-08-27 19:56 ` Ewan Milne
2015-08-30 10:36 ` Winkler, Tomas
2015-08-30 16:54 ` James Bottomley
2015-08-31 8:07 ` Winkler, Tomas
2015-07-28 13:54 ` [scsi 6/7 RESEND] scsi_debug: fix REPORT LUNS Well Known LU Tomas Winkler
2015-07-30 17:24 ` Martin K. Petersen
2015-07-28 13:54 ` [scsi 7/7] scsi_debug: resp_request: remove unused variable Tomas Winkler
2015-07-30 17:24 ` Martin K. Petersen
2015-07-30 17:21 ` [scsi 1/7 RESEND] scsi_debug: define pr_fmt() for consistent logging Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438091666-18113-3-git-send-email-tomas.winkler@intel.com \
--to=tomas.winkler@intel.com \
--cc=James.Bottomley@hansenpartnership.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox