From: Miklos Szeredi <miklos@szeredi.hu>
Date: Fri, 8 Apr 2005 15:15:28 +0000 (+0000)
Subject: fix
X-Git-Tag: fuse_2_3_pre5~5
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b7640d2ef760e0034eded92d0963c725057d7799;p=qemu-gpiodev%2Flibfuse.git

fix
---

diff --git a/ChangeLog b/ChangeLog
index 4c63b9b..24d9da8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-08  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Fix Oops in case of nfs export.  Spotted by David Shaw
+
 2005-04-07  Miklos Szeredi <miklos@szeredi.hu>
 
 	* Released 2.3-pre4
diff --git a/kernel/dir.c b/kernel/dir.c
index 093bbb9..6ae498c 100644
--- a/kernel/dir.c
+++ b/kernel/dir.c
@@ -647,7 +647,8 @@ static int fuse_dir_release(struct inode *inode, struct file *file)
 
 static int fuse_dir_fsync(struct file *file, struct dentry *de, int datasync)
 {
-	return fuse_fsync_common(file, de, datasync, 1);
+	/* nfsd can call this with no file */
+	return file ? fuse_fsync_common(file, de, datasync, 1) : 0;
 }
 
 static unsigned iattr_to_fattr(struct iattr *iattr, struct fuse_attr *fattr)