diff options
| author | Alex Elder <aelder@sgi.com> | 2009-10-08 14:53:44 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2009-10-08 14:53:44 -0400 |
| commit | e09d39968bd8befa087f10f970fa236e8694b643 (patch) | |
| tree | 393f4cdd32504ed435b7a5f728cf74855378459d /fs/xfs/linux-2.6/xfs_lrw.c | |
| parent | fdec29c5fcd2705d61c1d14a1d4c74be03e9627c (diff) | |
| parent | d0800703febc04827b8fa91921aa4e254d01e8d1 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_lrw.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_lrw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c index 49e4a6aea73c..072050f8d346 100644 --- a/fs/xfs/linux-2.6/xfs_lrw.c +++ b/fs/xfs/linux-2.6/xfs_lrw.c | |||
| @@ -667,7 +667,7 @@ start: | |||
| 667 | xip->i_new_size = new_size; | 667 | xip->i_new_size = new_size; |
| 668 | 668 | ||
| 669 | if (likely(!(ioflags & IO_INVIS))) | 669 | if (likely(!(ioflags & IO_INVIS))) |
| 670 | xfs_ichgtime(xip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG); | 670 | file_update_time(file); |
| 671 | 671 | ||
| 672 | /* | 672 | /* |
| 673 | * If the offset is beyond the size of the file, we have a couple | 673 | * If the offset is beyond the size of the file, we have a couple |