fix

diff --git a/ChangeLog b/ChangeLog
index 4c63b9bf9449c4212afeda76c468a1406b4601e4..24d9da8114be5cfb454f92c01237bd45f4e3d354 100644 (file)
--- 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 093bbb9fe59689d0e4052407208cff7d297778b3..6ae498cfd885cff2137dd7a46837ea56d5c4c1fc 100644 (file)
--- 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)