diff options
| author | Christoph Hellwig <hch@lst.de> | 2010-06-04 11:29:55 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-09 16:47:31 -0400 |
| commit | 282dc178849882289d30e58b54be6b2799b351aa (patch) | |
| tree | 4c6697cdf2d914889e002f32af6bf51bb2750063 /fs/hfs | |
| parent | ea0f04e59543bafb3d2cbe37a0d375acb0bb2c34 (diff) | |
| download | op-kernel-dev-282dc178849882289d30e58b54be6b2799b351aa.zip op-kernel-dev-282dc178849882289d30e58b54be6b2799b351aa.tar.gz | |
get rid of cont_write_begin_newtrunc
Move the call to vmtruncate to get rid of accessive blocks to the callers
in preparation of the new truncate sequence and rename the non-truncating
version to cont_write_begin.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/hfs')
| -rw-r--r-- | fs/hfs/inode.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c index 07b2464..8df18e6 100644 --- a/fs/hfs/inode.c +++ b/fs/hfs/inode.c @@ -39,10 +39,19 @@ static int hfs_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned len, unsigned flags, struct page **pagep, void **fsdata) { + int ret; + *pagep = NULL; - return cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata, + ret = cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata, hfs_get_block, &HFS_I(mapping->host)->phys_size); + if (unlikely(ret)) { + loff_t isize = mapping->host->i_size; + if (pos + len > isize) + vmtruncate(mapping->host, isize); + } + + return ret; } static sector_t hfs_bmap(struct address_space *mapping, sector_t block) |
