]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge git://oss.sgi.com:8090/oss/git/rc-fixes-xfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 00:28:26 +0000 (16:28 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 00:28:26 +0000 (16:28 -0800)
fs/xfs/linux-2.6/xfs_aops.c
fs/xfs/linux-2.6/xfs_iops.c

index 9892268e30050fdd4a21846160c74a708fe56545..8f2beec526cfb58257dbf77b258384ce2310970b 100644 (file)
@@ -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;
                        }
                }
index eda7919b70a18814e82477828eeaa91794ccb8d6..d7f6f2d8ac8ec1c3b8f3185d3e18e958f8dc65a6 100644 (file)
@@ -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;