[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>

diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index adfbbb07448a27a47d761b60b1b109ebfb3f3e76..fdd5520eb3d2aa4b83cd037f6b6f84a6a11ad7f4 100644 (file)
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -851,7 +851,7 @@ struct zfcp_fsf_req {
        struct zfcp_adapter    *adapter;       /* adapter request belongs to */
        u8                     sbal_number;    /* nr of SBALs free for use */
        u8                     sbal_first;     /* first SBAL for this request */
-       u8                     sbal_last;      /* last possible SBAL for
+       u8                     sbal_limit;      /* last possible SBAL for
                                                  this reuest */
        u8                     sbal_curr;      /* current SBAL during creation
                                                  of request */

diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 8ca5f074c68734ba07a11229087a390c49e8a2f3..b6b6b36c6f209ed22889d5fa9f7f6be2ec674e88 100644 (file)
--- 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)
 {
        int count = atomic_read(&fsf_req->adapter->request_queue.free_count);
        count = min(count, max_sbals);
-       fsf_req->sbal_last  = fsf_req->sbal_first;
-       fsf_req->sbal_last += (count - 1);
-       fsf_req->sbal_last %= QDIO_MAX_BUFFERS_PER_Q;
+       fsf_req->sbal_limit  = fsf_req->sbal_first;
+       fsf_req->sbal_limit += (count - 1);
+       fsf_req->sbal_limit %= QDIO_MAX_BUFFERS_PER_Q;
 }
 
 /**
@@ -455,7 +455,7 @@ zfcp_qdio_sbal_chain(struct zfcp_fsf_req *fsf_req, unsigned long sbtype)
        sbale->flags |= SBAL_FLAGS_LAST_ENTRY;
 
        /* don't exceed last allowed SBAL */
-       if (fsf_req->sbal_curr == fsf_req->sbal_last)
+       if (fsf_req->sbal_curr == fsf_req->sbal_limit)
                return NULL;
 
        /* set chaining flag in first SBALE of current SBAL */