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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
tux
/
main.c
diff --git
a/net/tux/main.c
b/net/tux/main.c
index
d62263b
..
663ce97
100644
(file)
--- a/
net/tux/main.c
+++ b/
net/tux/main.c
@@
-170,10
+170,10
@@
static int init_queues (int nr_tux_threads)
INIT_LIST_HEAD(&ti->all_requests);
INIT_LIST_HEAD(&ti->all_requests);
-
ti->free_requests_lock = SPIN_LOCK_UNLOCKED
;
+
spin_lock_init(&ti->free_requests_lock)
;
INIT_LIST_HEAD(&ti->free_requests);
INIT_LIST_HEAD(&ti->free_requests);
-
ti->work_lock = SPIN_LOCK_UNLOCKED
;
+
spin_lock_init(&ti->work_lock)
;
INIT_LIST_HEAD(&ti->work_pending);
INIT_LIST_HEAD(&ti->lru);
INIT_LIST_HEAD(&ti->work_pending);
INIT_LIST_HEAD(&ti->lru);
@@
-1197,7
+1197,7
@@
eventloop:
if (ret)
GOTO_ERR_unlock;
addr = (char *)(unsigned long)u_addr;
if (ret)
GOTO_ERR_unlock;
addr = (char *)(unsigned long)u_addr;
- filp = dentry_open(req->dentry,
O_RDONLY, 0
);
+ filp = dentry_open(req->dentry,
NULL, O_RDONLY
);
dget(req->dentry);
generic_file_read(filp, addr, req->total_file_len, &ppos);
fput(filp);
dget(req->dentry);
generic_file_read(filp, addr, req->total_file_len, &ppos);
fput(filp);