X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Ftux%2Fmain.c;h=d62263b88ee145984dab78b9d5a9c3fcdc546b34;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=663ce97379eee2e720864959798545316ba0ce43;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/net/tux/main.c b/net/tux/main.c
index 663ce9737..d62263b88 100644
--- 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);
 
-		spin_lock_init(&ti->free_requests_lock);
+		ti->free_requests_lock = SPIN_LOCK_UNLOCKED;
 		INIT_LIST_HEAD(&ti->free_requests);
 
-		spin_lock_init(&ti->work_lock);
+		ti->work_lock = SPIN_LOCK_UNLOCKED;
 		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;
-			filp = dentry_open(req->dentry, NULL, O_RDONLY);
+			filp = dentry_open(req->dentry, O_RDONLY, 0);
 			dget(req->dentry);
 			generic_file_read(filp, addr, req->total_file_len, &ppos);
 			fput(filp);