diff options
| author | Martin Peschke <mp3@de.ibm.com> | 2008-05-19 06:17:42 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-06-05 10:27:14 -0400 |
| commit | d01d51beee4dd9f7ff9caf7491aa1727a318e665 (patch) | |
| tree | 42e732f62ce4139fd9dd7a25162989440a1f2212 | |
| parent | 0f83b110f0cf6aef59e66184d5a1513318d654b5 (diff) | |
[SCSI] zfcp: Rename sbal_last.
sbal_last is confusing, as it is not the last one actually used,
but just a limit. sbal_limit is a better name.
Signed-off-by: Martin Peschke <mp3@de.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
| -rw-r--r-- | drivers/s390/scsi/zfcp_def.h | 2 | ||||
| -rw-r--r-- | drivers/s390/scsi/zfcp_qdio.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index adfbbb07448a..fdd5520eb3d2 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h | |||
| @@ -851,7 +851,7 @@ struct zfcp_fsf_req { | |||
| 851 | struct zfcp_adapter *adapter; /* adapter request belongs to */ | 851 | struct zfcp_adapter *adapter; /* adapter request belongs to */ |
| 852 | u8 sbal_number; /* nr of SBALs free for use */ | 852 | u8 sbal_number; /* nr of SBALs free for use */ |
| 853 | u8 sbal_first; /* first SBAL for this request */ | 853 | u8 sbal_first; /* first SBAL for this request */ |
| 854 | u8 sbal_last; /* last possible SBAL for | 854 | u8 sbal_limit; /* last possible SBAL for |
| 855 | this reuest */ | 855 | this reuest */ |
| 856 | u8 sbal_curr; /* current SBAL during creation | 856 | u8 sbal_curr; /* current SBAL during creation |
| 857 | of request */ | 857 | of request */ |
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c index 8ca5f074c687..b6b6b36c6f20 100644 --- a/drivers/s390/scsi/zfcp_qdio.c +++ b/drivers/s390/scsi/zfcp_qdio.c | |||
| @@ -432,9 +432,9 @@ zfcp_qdio_sbal_limit(struct zfcp_fsf_req *fsf_req, int max_sbals) | |||
| 432 | { | 432 | { |
| 433 | int count = atomic_read(&fsf_req->adapter->request_queue.free_count); | 433 | int count = atomic_read(&fsf_req->adapter->request_queue.free_count); |
| 434 | count = min(count, max_sbals); | 434 | count = min(count, max_sbals); |
| 435 | fsf_req->sbal_last = fsf_req->sbal_first; | 435 | fsf_req->sbal_limit = fsf_req->sbal_first; |
| 436 | fsf_req->sbal_last += (count - 1); | 436 | fsf_req->sbal_limit += (count - 1); |
| 437 | fsf_req->sbal_last %= QDIO_MAX_BUFFERS_PER_Q; | 437 | fsf_req->sbal_limit %= QDIO_MAX_BUFFERS_PER_Q; |
| 438 | } | 438 | } |
| 439 | 439 | ||
| 440 | /** | 440 | /** |
| @@ -455,7 +455,7 @@ zfcp_qdio_sbal_chain(struct zfcp_fsf_req *fsf_req, unsigned long sbtype) | |||
| 455 | sbale->flags |= SBAL_FLAGS_LAST_ENTRY; | 455 | sbale->flags |= SBAL_FLAGS_LAST_ENTRY; |
| 456 | 456 | ||
| 457 | /* don't exceed last allowed SBAL */ | 457 | /* don't exceed last allowed SBAL */ |
| 458 | if (fsf_req->sbal_curr == fsf_req->sbal_last) | 458 | if (fsf_req->sbal_curr == fsf_req->sbal_limit) |
| 459 | return NULL; | 459 | return NULL; |
| 460 | 460 | ||
| 461 | /* set chaining flag in first SBALE of current SBAL */ | 461 | /* set chaining flag in first SBALE of current SBAL */ |
