diff options
| author | Stefan Richter | 2012-05-24 22:07:35 +0200 |
|---|---|---|
| committer | Nicholas Bellinger | 2012-05-31 01:15:33 +0200 |
| commit | 5f2a3d6191e49df5d56332d3b65d6636c355f635 (patch) | |
| tree | 59a8a1caa788307c021d6f2bdf19983ccb690f02 /drivers/target | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (diff) | |
| download | kernel-qcow2-linux-5f2a3d6191e49df5d56332d3b65d6636c355f635.tar.gz kernel-qcow2-linux-5f2a3d6191e49df5d56332d3b65d6636c355f635.tar.xz kernel-qcow2-linux-5f2a3d6191e49df5d56332d3b65d6636c355f635.zip | |
sbp-target: rename a variable to avoid name clash
'int login_id' shadows 'static atomic_t login_id'.
Seen as compilation warning on x86-32.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Acked-by: Chris Boot <bootc@bootc.net>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
| -rw-r--r-- | drivers/target/sbp/sbp_target.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c index 37c609898f84..7e6136e2ce81 100644 --- a/drivers/target/sbp/sbp_target.c +++ b/drivers/target/sbp/sbp_target.c @@ -587,14 +587,14 @@ static void sbp_management_request_logout( { struct sbp_tport *tport = agent->tport; struct sbp_tpg *tpg = tport->tpg; - int login_id; + int id; struct sbp_login_descriptor *login; - login_id = LOGOUT_ORB_LOGIN_ID(be32_to_cpu(req->orb.misc)); + id = LOGOUT_ORB_LOGIN_ID(be32_to_cpu(req->orb.misc)); - login = sbp_login_find_by_id(tpg, login_id); + login = sbp_login_find_by_id(tpg, id); if (!login) { - pr_warn("cannot find login: %d\n", login_id); + pr_warn("cannot find login: %d\n", id); req->status.status = cpu_to_be32( STATUS_BLOCK_RESP(STATUS_RESP_REQUEST_COMPLETE) | |