diff options
| author | Hannes Reinecke <hare@suse.de> | 2017-04-24 10:26:36 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-06-11 19:05:44 +0100 |
| commit | 6c9fe95373f5ac073c657d31beb369df0f14db60 (patch) | |
| tree | 6321efcf979349645721af2c16ea7619e49ee89f | |
| parent | 5bb6526728fd517cae788fc90008fd1f614f31a7 (diff) | |
| download | linux-stable-6c9fe95373f5ac073c657d31beb369df0f14db60.tar.gz linux-stable-6c9fe95373f5ac073c657d31beb369df0f14db60.tar.bz2 linux-stable-6c9fe95373f5ac073c657d31beb369df0f14db60.zip | |
scsi: sg: reset 'res_in_use' after unlinking reserved array
commit e791ce27c3f6a1d3c746fd6a8f8e36c9540ec6f9 upstream.
Once the reserved page array is unused we can reset the 'res_in_use'
state; here we can do a lazy update without holding the mutex as we only
need to check against concurrent access, not concurrent release.
[mkp: checkpatch]
Fixes: 1bc0eb044615 ("scsi: sg: protect accesses to 'reserved' page array")
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/scsi/sg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 03ad8dc2f34a..d02cfe63e8ed 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -2062,6 +2062,8 @@ sg_unlink_reserve(Sg_fd * sfp, Sg_request * srp) req_schp->sglist_len = 0; sfp->save_scat_len = 0; srp->res_used = 0; + /* Called without mutex lock to avoid deadlock */ + sfp->res_in_use = 0; } static Sg_request * |