diff options
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r-- | fs/nfsd/vfs.c | 34 |
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 | */ | ||
752 | static 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 | |||
747 | static int | 768 | static int |
748 | nfsd_sync(struct file *filp) | 769 | nfsd_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 | ||
753 | int | 781 | int |
754 | nfsd_sync_dir(struct dentry *dentry) | 782 | nfsd_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 | /* |