summaryrefslogtreecommitdiff
path: root/fs/xfs/linux-2.6/xfs_file.c
diff options
context:
space:
mode:
authorAlex Elder <aelder@sgi.com>2009-10-08 22:53:44 +0400
committerAlex Elder <aelder@sgi.com>2009-10-08 22:53:44 +0400
commite09d39968bd8befa087f10f970fa236e8694b643 (patch)
tree393f4cdd32504ed435b7a5f728cf74855378459d /fs/xfs/linux-2.6/xfs_file.c
parentfdec29c5fcd2705d61c1d14a1d4c74be03e9627c (diff)
parentd0800703febc04827b8fa91921aa4e254d01e8d1 (diff)
downloadlinux-e09d39968bd8befa087f10f970fa236e8694b643.tar.xz
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_file.c')
-rw-r--r--fs/xfs/linux-2.6/xfs_file.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index 988d8f87bc0f..6d65baf15a14 100644
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -176,14 +176,7 @@ xfs_file_fsync(
struct dentry *dentry,
int datasync)
{
- struct inode *inode = dentry->d_inode;
- struct xfs_inode *ip = XFS_I(inode);
- int error;
-
- /* capture size updates in I/O completion before writing the inode. */
- error = filemap_fdatawait(inode->i_mapping);
- if (error)
- return error;
+ struct xfs_inode *ip = XFS_I(dentry->d_inode);
xfs_iflags_clear(ip, XFS_ITRUNCATED);
return -xfs_fsync(ip);