diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-04-05 09:12:41 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-04-05 09:12:41 +0200 |
commit | 09f68072b32089f2e3b4749161eb3ce954faf8d4 (patch) | |
tree | b8b3c84f8a9c7150c2d830428daa3d641917ecf3 /fs/xfs/xfs_vnodeops.c | |
parent | d454f39f3ff3ee5a818c271026081a48a537bd41 (diff) | |
parent | ef49e4fae3f364af8da041dcc1bb4931c749b3da (diff) |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'fs/xfs/xfs_vnodeops.c')
-rw-r--r-- | fs/xfs/xfs_vnodeops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 37d8146ee15b..c48b4217ec47 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c @@ -2831,7 +2831,8 @@ xfs_change_file_space( ip->i_d.di_flags &= ~XFS_DIFLAG_PREALLOC; xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); - xfs_trans_set_sync(tp); + if (attr_flags & XFS_ATTR_SYNC) + xfs_trans_set_sync(tp); error = xfs_trans_commit(tp, 0); |