diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 16:28:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 16:28:26 -0800 |
| commit | b43d4ddaec2b33fd6eaf0bed970c86ab08a52aaf (patch) | |
| tree | 1d319bfaae322c348e31e59b5eddc4ec3f427e3b | |
| parent | 8e63e66b4cd066fe6c2d962460e286c2a61d3fe8 (diff) | |
| parent | 9bd6f13dfd1dfb2e8f20df50581ebe7344ba97bd (diff) | |
| download | linux-3.10-b43d4ddaec2b33fd6eaf0bed970c86ab08a52aaf.tar.gz linux-3.10-b43d4ddaec2b33fd6eaf0bed970c86ab08a52aaf.tar.bz2 linux-3.10-b43d4ddaec2b33fd6eaf0bed970c86ab08a52aaf.zip | |
Merge git://oss.sgi.com:8090/oss/git/rc-fixes-xfs-2.6
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 3 | ||||
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_iops.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index 9892268e300..8f2beec526c 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c @@ -747,10 +747,11 @@ xfs_convert_page( struct backing_dev_info *bdi; bdi = inode->i_mapping->backing_dev_info; + wbc->nr_to_write--; if (bdi_write_congested(bdi)) { wbc->encountered_congestion = 1; done = 1; - } else if (--wbc->nr_to_write <= 0) { + } else if (wbc->nr_to_write <= 0) { done = 1; } } diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c index eda7919b70a..d7f6f2d8ac8 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c @@ -673,6 +673,8 @@ linvfs_setattr( if (ia_valid & ATTR_ATIME) { vattr.va_mask |= XFS_AT_ATIME; vattr.va_atime = attr->ia_atime; + if (ia_valid & ATTR_ATIME_SET) + inode->i_atime = attr->ia_atime; } if (ia_valid & ATTR_MTIME) { vattr.va_mask |= XFS_AT_MTIME; |