Skip to content

Commit b757162

Browse files
hreineckegregkh
authored andcommitted
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>
1 parent a4075bb commit b757162

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/scsi/sg.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,6 +2052,8 @@ sg_unlink_reserve(Sg_fd * sfp, Sg_request * srp)
20522052
req_schp->sglist_len = 0;
20532053
sfp->save_scat_len = 0;
20542054
srp->res_used = 0;
2055+
/* Called without mutex lock to avoid deadlock */
2056+
sfp->res_in_use = 0;
20552057
}
20562058

20572059
static Sg_request *

0 commit comments

Comments
 (0)