From: Maxim Patlasov <mpatlasov@parallels.com>
Date: Fri, 26 Oct 2012 15:49:13 +0000 (+0400)
Subject: fuse: rework fuse_do_ioctl()
X-Git-Tag: next-20121112~99^2~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bf223cc61f93edbc223052cb2854d95344cb4723;p=karo-tx-linux.git

fuse: rework fuse_do_ioctl()

fuse_do_ioctl() already calculates the number of pages it's going to use. It is
stored in 'num_pages' variable. So the patch simply uses it for allocating
fuse_req.

Signed-off-by: Maxim Patlasov <mpatlasov@parallels.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index ba505bc86de6..d5d23dedf0fe 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1894,7 +1894,7 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
 		num_pages++;
 	}
 
-	req = fuse_get_req(fc, FUSE_MAX_PAGES_PER_REQ);
+	req = fuse_get_req(fc, num_pages);
 	if (IS_ERR(req)) {
 		err = PTR_ERR(req);
 		req = NULL;