2005-04-24 15:27:09

by Miklos Szeredi

[permalink] [raw]
Subject: [PATCH] FUSE: nfsd directory fsync fix

This patch fixes an Oops which happens when nfsd calls fsync on a
directory with a NULL file argument. The solution is to just ignore
the fsync. Thanks to David Shaw for the bugreport.

Signed-off-by: Miklos Szeredi <[email protected]>

diff -rup linux-2.6.12-rc2-mm3/fs/fuse/dir.c linux-fuse/fs/fuse/dir.c
--- linux-2.6.12-rc2-mm3/fs/fuse/dir.c 2005-04-22 15:49:29.000000000 +0200
+++ linux-fuse/fs/fuse/dir.c 2005-04-22 15:50:32.000000000 +0200
@@ -590,7 +590,8 @@ static int fuse_dir_release(struct inode

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)