Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b43d4dda authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://oss.sgi.com:8090/oss/git/rc-fixes-xfs-2.6

parents 8e63e66b 9bd6f13d

fs/xfs/linux-2.6/xfs_aops.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

			}

		}

fs/xfs/linux-2.6/xfs_iops.c

+2 −0
Original line number Diff line number Diff line
@@ -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;