diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-18 11:03:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-18 11:03:32 -0500 |
| commit | 57680915a6f2324c008b6213fe12b74507b3fcd0 (patch) | |
| tree | 24193356a3de7bb79742d20a00e8ec859c34a8ea /fs/xfs/xfs_inode.c | |
| parent | d55653377df36f8c04a966f3420335f1a0eb4d83 (diff) | |
| parent | 041388b54ed95cd169546bd83bacd08ee32bd7ea (diff) | |
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] Put the correct offset in dirent d_off
[XFS] Don't wait for pending I/Os when purging blocks beyond eof.
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index abf509a88915..344948082819 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
| @@ -1459,8 +1459,10 @@ xfs_itruncate_start( | |||
| 1459 | mp = ip->i_mount; | 1459 | mp = ip->i_mount; |
| 1460 | vp = XFS_ITOV(ip); | 1460 | vp = XFS_ITOV(ip); |
| 1461 | 1461 | ||
| 1462 | vn_iowait(ip); /* wait for the completion of any pending DIOs */ | 1462 | /* wait for the completion of any pending DIOs */ |
| 1463 | 1463 | if (new_size < ip->i_size) | |
| 1464 | vn_iowait(ip); | ||
| 1465 | |||
| 1464 | /* | 1466 | /* |
| 1465 | * Call toss_pages or flushinval_pages to get rid of pages | 1467 | * Call toss_pages or flushinval_pages to get rid of pages |
| 1466 | * overlapping the region being removed. We have to use | 1468 | * overlapping the region being removed. We have to use |