From 08ddb8e5e0af8c1326607f4d06c0dbc85733e483 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Sun, 14 Nov 2004 09:19:51 +0000 Subject: merge from 2_0_merge2 to 2_1_pre1 --- kernel/dev.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'kernel/dev.c') diff --git a/kernel/dev.c b/kernel/dev.c index 0c601d2..d353c7f 100644 --- a/kernel/dev.c +++ b/kernel/dev.c @@ -139,24 +139,22 @@ static struct fuse_req *do_get_request(struct fuse_conn *fc) struct fuse_req *fuse_get_request(struct fuse_conn *fc) { - struct fuse_req *req; - if (down_interruptible(&fc->unused_sem)) return NULL; + return do_get_request(fc); +} - req = do_get_request(fc); - return req; +struct fuse_req *fuse_get_request_nonint(struct fuse_conn *fc) +{ + down(&fc->unused_sem); + return do_get_request(fc); } struct fuse_req *fuse_get_request_nonblock(struct fuse_conn *fc) { - struct fuse_req *req; - if (down_trylock(&fc->unused_sem)) return NULL; - - req = do_get_request(fc); - return req; + return do_get_request(fc); } void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req) -- cgit v1.2.3