aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/vfs.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-01-06 13:37:03 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-01-07 15:40:45 -0500
commit9a8d248e2d2e9c880ac4561f27fea5dc200655bd (patch)
tree9033bfd8c10f7077d62095d5295e16acac9a4ab2 /fs/nfsd/vfs.c
parent2779e3ae39645515cb6c1126634f47c28c9e7190 (diff)
nfsd: fix double-locks of directory mutex
A number of nfsd operations depend on the i_mutex to cover more code than just the fsync, so the approach of 4c728ef583b3d8 "add a vfs_fsync helper" doesn't work for nfsd. Revert the parts of those patches that touch nfsd. Note: we can't, however, remove the logic from vfs_fsync that was needed only for the special case of nfsd, because a vfs_fsync(NULL,...) call can still result indirectly from a stackable filesystem that was called by nfsd. (Thanks to Christoph Hellwig for pointing this out.) Reported-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r--fs/nfsd/vfs.c34
1 files changed, 31 insertions, 3 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 44aa92aba891..6e50aaa56ca2 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -744,16 +744,44 @@ nfsd_close(struct file *filp)
744 fput(filp); 744 fput(filp);
745} 745}
746 746
747/*
748 * Sync a file
749 * As this calls fsync (not fdatasync) there is no need for a write_inode
750 * after it.
751 */
752static inline int nfsd_dosync(struct file *filp, struct dentry *dp,
753 const struct file_operations *fop)
754{
755 struct inode *inode = dp->d_inode;
756 int (*fsync) (struct file *, struct dentry *, int);
757 int err;
758
759 err = filemap_fdatawrite(inode->i_mapping);
760 if (err == 0 && fop && (fsync = fop->fsync))
761 err = fsync(filp, dp, 0);
762 if (err == 0)
763 err = filemap_fdatawait(inode->i_mapping);
764
765 return err;
766}
767
747static int 768static int
748nfsd_sync(struct file *filp) 769nfsd_sync(struct file *filp)
749{ 770{
750 return vfs_fsync(filp, filp->f_path.dentry, 0); 771 int err;
772 struct inode *inode = filp->f_path.dentry->d_inode;
773 dprintk("nfsd: sync file %s\n", filp->f_path.dentry->d_name.name);
774 mutex_lock(&inode->i_mutex);
775 err=nfsd_dosync(filp, filp->f_path.dentry, filp->f_op);
776 mutex_unlock(&inode->i_mutex);
777
778 return err;
751} 779}
752 780
753int 781int
754nfsd_sync_dir(struct dentry *dentry) 782nfsd_sync_dir(struct dentry *dp)
755{ 783{
756 return vfs_fsync(NULL, dentry, 0); 784 return nfsd_dosync(NULL, dp, dp->d_inode->i_fop);
757} 785}
758 786
759/* 787/*