From: Miklos Szeredi <miklos@szeredi.hu>
Date: Tue, 17 Jan 2006 06:14:25 +0000 (-0800)
Subject: [PATCH] fuse: fuse_copy_finish() order fix
X-Git-Tag: v2.6.16-rc1~61
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=222f1d69183f10d70a37de5785698fe0aa363c12;p=linux-2.6-omap-h63xx.git

[PATCH] fuse: fuse_copy_finish() order fix

fuse_copy_finish() must be called before request_end(), since the later might
sleep, and no sleeping is allowed between fuse_copy_one() and
fuse_copy_finish() because of kmap_atomic()/kunmap_atomic() used in them.

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index e08ab4702d9..9af88953db6 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -773,8 +773,10 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov,
 
 	list_del_init(&req->list);
 	if (req->interrupted) {
-		request_end(fc, req);
+		spin_unlock(&fuse_lock);
 		fuse_copy_finish(&cs);
+		spin_lock(&fuse_lock);
+		request_end(fc, req);
 		return -ENOENT;
 	}
 	req->out.h = oh;