]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
scsi: sg: reset 'res_in_use' after unlinking reserved array
authorHannes Reinecke <hare@suse.de>
Mon, 24 Apr 2017 08:26:36 +0000 (10:26 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Mon, 24 Apr 2017 22:18:24 +0000 (18:18 -0400)
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>
drivers/scsi/sg.c

index 8147147df2f434a2d15593a564a7a1d1ac3dca0a..06503c10ea27801e039d80df4379602b68192aac 100644 (file)
@@ -2056,6 +2056,8 @@ sg_unlink_reserve(Sg_fd * sfp, Sg_request * srp)
        req_schp->page_order = 0;
        req_schp->sglist_len = 0;
        srp->res_used = 0;
+       /* Called without mutex lock to avoid deadlock */
+       sfp->res_in_use = 0;
 }
 
 static Sg_request *