git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
smbfs
/
request.c
diff --git
a/fs/smbfs/request.c
b/fs/smbfs/request.c
index
c71dd27
..
a4bcae8
100644
(file)
--- a/
fs/smbfs/request.c
+++ b/
fs/smbfs/request.c
@@
-25,7
+25,7
@@
#define ROUND_UP(x) (((x)+3) & ~3)
/* cache for request structures */
#define ROUND_UP(x) (((x)+3) & ~3)
/* cache for request structures */
-static
kmem_cache_t
*req_cachep;
+static
struct kmem_cache
*req_cachep;
static int smb_request_send_req(struct smb_request *req);
static int smb_request_send_req(struct smb_request *req);
@@
-49,8
+49,7
@@
int smb_init_request_cache(void)
void smb_destroy_request_cache(void)
{
void smb_destroy_request_cache(void)
{
- if (kmem_cache_destroy(req_cachep))
- printk(KERN_INFO "smb_destroy_request_cache: not all structures were freed\n");
+ kmem_cache_destroy(req_cachep);
}
/*
}
/*
@@
-62,7
+61,7
@@
static struct smb_request *smb_do_alloc_request(struct smb_sb_info *server,
struct smb_request *req;
unsigned char *buf = NULL;
struct smb_request *req;
unsigned char *buf = NULL;
- req = kmem_cache_alloc(req_cachep,
SLAB
_KERNEL);
+ req = kmem_cache_alloc(req_cachep,
GFP
_KERNEL);
VERBOSE("allocating request: %p\n", req);
if (!req)
goto out;
VERBOSE("allocating request: %p\n", req);
if (!req)
goto out;
@@
-400,8
+399,7
@@
static int smb_request_send_req(struct smb_request *req)
if (!(req->rq_flags & SMB_REQ_TRANSMITTED))
goto out;
if (!(req->rq_flags & SMB_REQ_TRANSMITTED))
goto out;
- list_del_init(&req->rq_queue);
- list_add_tail(&req->rq_queue, &server->recvq);
+ list_move_tail(&req->rq_queue, &server->recvq);
result = 1;
out:
return result;
result = 1;
out:
return result;
@@
-435,8
+433,7
@@
int smb_request_send_server(struct smb_sb_info *server)
result = smb_request_send_req(req);
if (result < 0) {
server->conn_error = result;
result = smb_request_send_req(req);
if (result < 0) {
server->conn_error = result;
- list_del_init(&req->rq_queue);
- list_add(&req->rq_queue, &server->xmitq);
+ list_move(&req->rq_queue, &server->xmitq);
result = -EIO;
goto out;
}
result = -EIO;
goto out;
}