diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | kernel/dir.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -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) |