Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 181821
b: refs/heads/master
c: e8b217e
h: refs/heads/master
i:
  181819: 94818f5
v: v3
  • Loading branch information
Christoph Hellwig authored and Dave Chinner committed Feb 1, 2010
1 parent c95324b commit c671fe7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 20026d92013d7bb3abb295337191def6758fc086
refs/heads/master: e8b217e7530c6a073ac69f1c85b922d93fdf5647
12 changes: 2 additions & 10 deletions trunk/fs/xfs/xfs_vnodeops.c
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ xfs_fsync(
{
xfs_trans_t *tp;
int error = 0;
int log_flushed = 0, changed = 1;
int log_flushed = 0;

xfs_itrace_entry(ip);

Expand Down Expand Up @@ -627,18 +627,10 @@ xfs_fsync(
* disk yet, the inode will be still be pinned. If it is,
* force the log.
*/

xfs_iunlock(ip, XFS_ILOCK_SHARED);

if (xfs_ipincount(ip)) {
error = _xfs_log_force(ip->i_mount, XFS_LOG_SYNC,
&log_flushed);
} else {
/*
* If the inode is not pinned and nothing has changed
* we don't need to flush the cache.
*/
changed = 0;
}
} else {
/*
Expand Down Expand Up @@ -673,7 +665,7 @@ xfs_fsync(
xfs_iunlock(ip, XFS_ILOCK_EXCL);
}

if ((ip->i_mount->m_flags & XFS_MOUNT_BARRIER) && changed) {
if (ip->i_mount->m_flags & XFS_MOUNT_BARRIER) {
/*
* If the log write didn't issue an ordered tag we need
* to flush the disk cache for the data device now.
Expand Down

0 comments on commit c671fe7

Please sign in to comment.