---

yaml --- r: 25719 b: refs/heads/master c: 56cf34f h: refs/heads/master i: 25717: cda9ac3 25715: 3935c0b 25711: 0ee72fd v: v3
git-mirror · Apr 11, 2006 · 7eab255 · 7eab255
1 parent 7bebc14
commit 7eab255
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4858cae4f0904681eab58a16891c22397618a2a2
+refs/heads/master: 56cf34ff0795692327234963dcdcc2cdeec2bb3d
diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c
@@ -1,6 +1,6 @@
 /*
   FUSE: Filesystem in Userspace
-  Copyright (C) 2001-2005  Miklos Szeredi <miklos@szeredi.hu>
+  Copyright (C) 2001-2006  Miklos Szeredi <miklos@szeredi.hu>
 
   This program can be distributed under the terms of the GNU GPL.
   See the file COPYING.
@@ -565,8 +565,12 @@ static ssize_t fuse_direct_io(struct file *file, const char __user *buf,
 		buf += nres;
 		if (nres != nbytes)
 			break;
-		if (count)
-			fuse_reset_request(req);
+		if (count) {
+			fuse_put_request(fc, req);
+			req = fuse_get_req(fc);
+			if (IS_ERR(req))
+				break;
+		}
 	}
 	fuse_put_request(fc, req);
 	if (res > 0) {