diff options
author | Akinobu Mita <mita@miraclelinux.com> | 2006-06-26 03:24:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 12:58:18 -0400 |
commit | f116629d03655adaf7832b93b03c99391d09d4a7 (patch) | |
tree | 526f689619817df3c23ab00e3228b4776bde2190 /fs/smbfs | |
parent | 179e09172ab663b8587ecc46bb18a56a770304a9 (diff) |
[PATCH] fs: use list_move()
This patch converts the combination of list_del(A) and list_add(A, B) to
list_move(A, B) under fs/.
Cc: Ian Kent <raven@themaw.net>
Acked-by: Joel Becker <joel.becker@oracle.com>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Cc: Hans Reiser <reiserfs-dev@namesys.com>
Cc: Urban Widmark <urban@teststation.com>
Acked-by: David Howells <dhowells@redhat.com>
Acked-by: Mark Fasheh <mark.fasheh@oracle.com>
Signed-off-by: Akinobu Mita <mita@miraclelinux.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/smbfs')
-rw-r--r-- | fs/smbfs/request.c | 6 | ||||
-rw-r--r-- | fs/smbfs/smbiod.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/fs/smbfs/request.c b/fs/smbfs/request.c index c71dd2760d32..c8e96195b96e 100644 --- a/fs/smbfs/request.c +++ b/fs/smbfs/request.c | |||
@@ -400,8 +400,7 @@ static int smb_request_send_req(struct smb_request *req) | |||
400 | if (!(req->rq_flags & SMB_REQ_TRANSMITTED)) | 400 | if (!(req->rq_flags & SMB_REQ_TRANSMITTED)) |
401 | goto out; | 401 | goto out; |
402 | 402 | ||
403 | list_del_init(&req->rq_queue); | 403 | list_move_tail(&req->rq_queue, &server->recvq); |
404 | list_add_tail(&req->rq_queue, &server->recvq); | ||
405 | result = 1; | 404 | result = 1; |
406 | out: | 405 | out: |
407 | return result; | 406 | return result; |
@@ -435,8 +434,7 @@ int smb_request_send_server(struct smb_sb_info *server) | |||
435 | result = smb_request_send_req(req); | 434 | result = smb_request_send_req(req); |
436 | if (result < 0) { | 435 | if (result < 0) { |
437 | server->conn_error = result; | 436 | server->conn_error = result; |
438 | list_del_init(&req->rq_queue); | 437 | list_move(&req->rq_queue, &server->xmitq); |
439 | list_add(&req->rq_queue, &server->xmitq); | ||
440 | result = -EIO; | 438 | result = -EIO; |
441 | goto out; | 439 | goto out; |
442 | } | 440 | } |
diff --git a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c index 3f71384020cb..24577e2c489b 100644 --- a/fs/smbfs/smbiod.c +++ b/fs/smbfs/smbiod.c | |||
@@ -193,8 +193,7 @@ int smbiod_retry(struct smb_sb_info *server) | |||
193 | if (req->rq_flags & SMB_REQ_RETRY) { | 193 | if (req->rq_flags & SMB_REQ_RETRY) { |
194 | /* must move the request to the xmitq */ | 194 | /* must move the request to the xmitq */ |
195 | VERBOSE("retrying request %p on recvq\n", req); | 195 | VERBOSE("retrying request %p on recvq\n", req); |
196 | list_del(&req->rq_queue); | 196 | list_move(&req->rq_queue, &server->xmitq); |
197 | list_add(&req->rq_queue, &server->xmitq); | ||
198 | continue; | 197 | continue; |
199 | } | 198 | } |
200 | #endif | 199 | #endif |