diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-01 15:14:04 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-01 15:14:04 -0400 |
| commit | 5679027e74126e0dfc860869b0e7ceab1dd06318 (patch) | |
| tree | 9a18b1a2f53be3bad8c9e4db01617fb51f067f64 /fs/xfs/xfs_vnodeops.c | |
| parent | ccd0d44fad38dc1bb4b26dcc7a30e9f2c3b36870 (diff) | |
| parent | a4dd99250dc49031e6a92a895dbcc230a4832083 (diff) | |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent
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( | |||
| 2831 | ip->i_d.di_flags &= ~XFS_DIFLAG_PREALLOC; | 2831 | ip->i_d.di_flags &= ~XFS_DIFLAG_PREALLOC; |
| 2832 | 2832 | ||
| 2833 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); | 2833 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); |
| 2834 | xfs_trans_set_sync(tp); | 2834 | if (attr_flags & XFS_ATTR_SYNC) |
| 2835 | xfs_trans_set_sync(tp); | ||
| 2835 | 2836 | ||
| 2836 | error = xfs_trans_commit(tp, 0); | 2837 | error = xfs_trans_commit(tp, 0); |
| 2837 | 2838 | ||