Browse Source

command->data_{in,out} are now userptr_t, so it is invalid to compare

against NULL.
tags/v0.9.3
Michael Brown 18 years ago
parent
commit
2497270c14
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      src/net/tcp/iscsi.c

+ 2
- 2
src/net/tcp/iscsi.c View File

129
 	/* Copy data to data-in buffer */
129
 	/* Copy data to data-in buffer */
130
 	offset = ntohl ( data_in->offset ) + iscsi->rx_offset;
130
 	offset = ntohl ( data_in->offset ) + iscsi->rx_offset;
131
 	assert ( iscsi->command != NULL );
131
 	assert ( iscsi->command != NULL );
132
-	assert ( iscsi->command->data_in != NULL );
132
+	assert ( iscsi->command->data_in );
133
 	assert ( ( offset + len ) <= iscsi->command->data_in_len );
133
 	assert ( ( offset + len ) <= iscsi->command->data_in_len );
134
 	copy_to_user ( iscsi->command->data_in, offset, data, len );
134
 	copy_to_user ( iscsi->command->data_in, offset, data, len );
135
 
135
 
235
 		   iscsi->tx_offset );
235
 		   iscsi->tx_offset );
236
 	remaining = ( ISCSI_DATA_LEN ( data_out->lengths ) - iscsi->tx_offset);
236
 	remaining = ( ISCSI_DATA_LEN ( data_out->lengths ) - iscsi->tx_offset);
237
 	assert ( iscsi->command != NULL );
237
 	assert ( iscsi->command != NULL );
238
-	assert ( iscsi->command->data_out != NULL );
238
+	assert ( iscsi->command->data_out );
239
 	assert ( ( offset + remaining ) <= iscsi->command->data_out_len );
239
 	assert ( ( offset + remaining ) <= iscsi->command->data_out_len );
240
 	
240
 	
241
 	if ( remaining < len )
241
 	if ( remaining < len )

Loading…
Cancel
Save