diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-19 08:06:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-19 08:06:25 -0700 |
| commit | a289bbe27785a5f47dc501fa2bc18edfec147117 (patch) | |
| tree | 848d1625340483d1202c531916ab8de42e01ec0a | |
| parent | 41e904dee22066ae7ac3a7f695b2c8bd43ce4e04 (diff) | |
| parent | e99f056b2777f3fc6871ff6347c98c0321ad2f8f (diff) | |
| download | linux-3.10-a289bbe27785a5f47dc501fa2bc18edfec147117.tar.gz linux-3.10-a289bbe27785a5f47dc501fa2bc18edfec147117.tar.bz2 linux-3.10-a289bbe27785a5f47dc501fa2bc18edfec147117.zip | |
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
[XFS] Update the MAINTAINERS file entry for XFS - change git repo name.
[XFS] s/memclear_highpage_flush/zero_user_page/
[XFS] Update the MAINTAINERS file entry for XFS.
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_lrw.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bef79776b38..4ce895a4b5b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4022,11 +4022,11 @@ S: Supported XFS FILESYSTEM P: Silicon Graphics Inc -P: Tim Shimmin, David Chatterton +P: Tim Shimmin M: xfs-masters@oss.sgi.com L: xfs@oss.sgi.com W: http://oss.sgi.com/projects/xfs -T: git git://oss.sgi.com:8090/xfs/xfs-2.6 +T: git git://oss.sgi.com:8090/xfs/xfs-2.6.git S: Supported XILINX UARTLITE SERIAL DRIVER diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c index 86fb671a8bc..ed90403f0ee 100644 --- a/fs/xfs/linux-2.6/xfs_lrw.c +++ b/fs/xfs/linux-2.6/xfs_lrw.c @@ -159,7 +159,7 @@ xfs_iozero( if (status) goto unlock; - memclear_highpage_flush(page, offset, bytes); + zero_user_page(page, offset, bytes, KM_USER0); status = mapping->a_ops->commit_write(NULL, page, offset, offset + bytes); |