Skip to contentSkip to conversation

drivers/scsi/storvsc_drv.c:1658 storvsc_queuecommand() warn: curly braces intended?

PATCH James Bottomley 2 participants 2 messages Apr 13, 2015 1 message not in the archive SCSI

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20150413115603.GR16501@mwanda

James Bottomley

author
#1 lore raw
Quoted 34 lines · Dan Carpenter
tree:   git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git misc
head:   0351b8f81392c6dbbbb036e5c8f73ceff68726e9
commit: be0cf6ca301c61458dc4aa1a37acf4f58d2ed3d6 [14/106] scsi: storvsc: Set the tablesize based on the information given by the host

drivers/scsi/storvsc_drv.c:1658 storvsc_queuecommand() warn: curly braces intended?

git remote add scsi git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
git remote update scsi
git checkout be0cf6ca301c61458dc4aa1a37acf4f58d2ed3d6
vim +1658 drivers/scsi/storvsc_drv.c

c5b463ae drivers/staging/hv/storvsc_drv.c K. Y. Srinivasan 2011-05-10  1642  			sgl = cmd_request->bounce_sgl;
c5b463ae drivers/staging/hv/storvsc_drv.c K. Y. Srinivasan 2011-05-10  1643  			sg_count = cmd_request->bounce_sgl_count;
c5b463ae drivers/staging/hv/storvsc_drv.c K. Y. Srinivasan 2011-05-10  1644  		}
c5b463ae drivers/staging/hv/storvsc_drv.c K. Y. Srinivasan 2011-05-10  1645  
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1646  
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1647  		if (sg_count > MAX_PAGE_BUFFER_COUNT) {
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1648  
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1649  			payload_sz = (sg_count * sizeof(void *) +
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1650  				      sizeof(struct vmbus_packet_mpb_array));
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1651  			payload = kmalloc(payload_sz, GFP_ATOMIC);
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1652  			if (!payload) {
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1653  				if (cmd_request->bounce_sgl_count)

Start block here.

be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1654  					destroy_bounce_buffer(
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1655  					cmd_request->bounce_sgl,
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1656  					cmd_request->bounce_sgl_count);
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1657  
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27 @1658  					return SCSI_MLQUEUE_DEVICE_BUSY;

End block here.

Quoted 8 lines
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1659  			}
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1660  		}
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1661  
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1662  		payload->range.len = length;
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1663  		payload->range.offset = sgl[0].offset;
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1664  
aaced993 drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1665  		cur_sgl = sgl;
aaced993 drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1666  		for (i = 0; i < sg_count; i++) {

I think this is just screwed up indentation. You have to return DEVICE_BUSY for the kmalloc failure. The if is just seeing if cleanup is needed.

James

#2 lore raw
Quoted 73 lines

-----Original Message-----
From: James Bottomley [mailto:[email protected]]
Sent: Monday, April 13, 2015 7:26 AM
To: [email protected]
Cc: [email protected]; [email protected]; KY Srinivasan
Subject: Re: [scsi:misc 14/106] drivers/scsi/storvsc_drv.c:1658 storvsc_queuecommand() warn: curly braces intended?

Quoted 3 lines · Dan Carpenter
tree:   git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git misc
head:   0351b8f81392c6dbbbb036e5c8f73ceff68726e9
commit: be0cf6ca301c61458dc4aa1a37acf4f58d2ed3d6 [14/106] scsi:

storvsc: Set the tablesize based on the information given by the host

Quoted 2 lines

drivers/scsi/storvsc_drv.c:1658 storvsc_queuecommand() warn: curly

braces intended?

Quoted 2 lines

git remote add scsi

git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git

Quoted 5 lines

git remote update scsi
git checkout be0cf6ca301c61458dc4aa1a37acf4f58d2ed3d6 vim +1658 drivers/scsi/storvsc_drv.c

c5b463ae drivers/staging/hv/storvsc_drv.c K. Y. Srinivasan 2011-05-10 1642

			sgl = cmd_request->bounce_sgl;
Quoted 1 line

c5b463ae drivers/staging/hv/storvsc_drv.c K. Y. Srinivasan 2011-05-10 1643

			sg_count = cmd_request->bounce_sgl_count;
Quoted 1 line

c5b463ae drivers/staging/hv/storvsc_drv.c K. Y. Srinivasan 2011-05-10 1644

		}
Quoted 3 lines
c5b463ae drivers/staging/hv/storvsc_drv.c K. Y. Srinivasan 2011-05-10  1645
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1646
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1647
		if (sg_count > MAX_PAGE_BUFFER_COUNT) {
Quoted 2 lines
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1648
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1649

payload_sz = (sg_count * sizeof(void *) +

Quoted 1 line

be0cf6ca drivers/scsi/storvsc_drv.c K. Y. Srinivasan 2015-03-27 1650

				      sizeof(struct vmbus_packet_mpb_array));
Quoted 1 line

be0cf6ca drivers/scsi/storvsc_drv.c K. Y. Srinivasan 2015-03-27 1651

			payload = kmalloc(payload_sz, GFP_ATOMIC);
Quoted 1 line

be0cf6ca drivers/scsi/storvsc_drv.c K. Y. Srinivasan 2015-03-27 1652

			if (!payload) {
Quoted 1 line

be0cf6ca drivers/scsi/storvsc_drv.c K. Y. Srinivasan 2015-03-27 1653

				if (cmd_request->bounce_sgl_count)
Quoted 4 lines

Start block here.

be0cf6ca drivers/scsi/storvsc_drv.c K. Y. Srinivasan 2015-03-27 1654

					destroy_bounce_buffer(
Quoted 1 line

be0cf6ca drivers/scsi/storvsc_drv.c K. Y. Srinivasan 2015-03-27 1655

					cmd_request->bounce_sgl,
Quoted 1 line

be0cf6ca drivers/scsi/storvsc_drv.c K. Y. Srinivasan 2015-03-27 1656

					cmd_request->bounce_sgl_count);
Quoted 2 lines

be0cf6ca drivers/scsi/storvsc_drv.c K. Y. Srinivasan 2015-03-27 1657
be0cf6ca drivers/scsi/storvsc_drv.c K. Y. Srinivasan 2015-03-27 @1658

return
SCSI_MLQUEUE_DEVICE_BUSY;

Quoted 4 lines

End block here.

be0cf6ca drivers/scsi/storvsc_drv.c K. Y. Srinivasan 2015-03-27 1659

			}
Quoted 1 line

be0cf6ca drivers/scsi/storvsc_drv.c K. Y. Srinivasan 2015-03-27 1660

		}
Quoted 2 lines
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1661
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1662
		payload->range.len = length;
Quoted 1 line

be0cf6ca drivers/scsi/storvsc_drv.c K. Y. Srinivasan 2015-03-27 1663

		payload->range.offset = sgl[0].offset;
Quoted 2 lines
be0cf6ca drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1664
aaced993 drivers/scsi/storvsc_drv.c       K. Y. Srinivasan 2015-03-27  1665
Quoted 7 lines
		cur_sgl = sgl;
Quoted 1 line

aaced993 drivers/scsi/storvsc_drv.c K. Y. Srinivasan 2015-03-27 1666

		for (i = 0; i < sg_count; i++) {

I think this is just screwed up indentation. You have to return DEVICE_BUSY for the kmalloc failure. The if is just seeing if cleanup is needed.

Yes; bad indentation. I will fix it.

K. Y

Quoted 2 lines

James