mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
Merge git://oss.sgi.com:8090/oss/git/rc-fixes-xfs-2.6
This commit is contained in:
commit
b43d4ddaec
2 changed files with 4 additions and 1 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue