Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Jan 7, 2017

lore

Share & tools

lore

Jens Axboe

author

2017-01-07 13:00 UTC #0 lore raw

The following changes since commit 8c4e634a44ca35a21387b79ae6e701f951e2cb0c:

init: cleaner gcd() (2017-01-05 10:38:41 -0700)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 28c43a89ae13b648dd37269d288fbbea2550faa8:

Fix comment on SCSI commands (2017-01-06 11:26:04 -0700)

----------------------------------------------------------------
Tomohiro Kusumi (2):
Remove doubled ; in .c
Fix comment on SCSI commands

 engines/net.c | 2 +-
 engines/sg.c  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

---

Diff of recent changes:

engines/net.c +1 -1

index 3bdd5cd..37d44fd 100644
@@ -1371,7 +1371,7 @@ static int fio_netio_setup(struct thread_data *td)
 	}
 
 	if (!td->io_ops_data) {
-		nd = malloc(sizeof(*nd));;
+		nd = malloc(sizeof(*nd));
 
 		memset(nd, 0, sizeof(*nd));
 		nd->listenfd = -1;

engines/sg.c +2 -2

index 001193d..2ad3394 100644
@@ -425,8 +425,8 @@ static int fio_sgio_read_capacity(struct thread_data *td, unsigned int *bs,
 	 */
 	if (*max_lba == MAX_10B_LBA) {
 		hdr.cmd_len = 16;
-		hdr.cmdp[0] = 0x9e; // Read Capacity(16)
-		hdr.cmdp[1] = 0x10; // service action
+		hdr.cmdp[0] = 0x9e; // service action
+		hdr.cmdp[1] = 0x10; // Read Capacity(16)
 		hdr.cmdp[10] = (unsigned char) ((sizeof(buf) >> 24) & 0xff);
 		hdr.cmdp[11] = (unsigned char) ((sizeof(buf) >> 16) & 0xff);
 		hdr.cmdp[12] = (unsigned char) ((sizeof(buf) >> 8) & 0xff);