Commit 282dc178 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ea0f04e5

fs/adfs/inode.c

+10 −1
Original line number Diff line number Diff line
@@ -50,10 +50,19 @@ static int adfs_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,

				adfs_get_block,

				&ADFS_I(mapping->host)->mmu_private);

	if (unlikely(ret)) {

		loff_t isize = mapping->host->i_size;

		if (pos + len > isize)

			vmtruncate(mapping->host, isize);

	}



	return ret;

}



static sector_t _adfs_bmap(struct address_space *mapping, sector_t block)

fs/affs/file.c

+10 −1
Original line number Diff line number Diff line
@@ -406,10 +406,19 @@ static int affs_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,

				affs_get_block,

				&AFFS_I(mapping->host)->mmu_private);

	if (unlikely(ret)) {

		loff_t isize = mapping->host->i_size;

		if (pos + len > isize)

			vmtruncate(mapping->host, isize);

	}



	return ret;

}



static sector_t _affs_bmap(struct address_space *mapping, sector_t block)

fs/buffer.c

+1 −20
Original line number Diff line number Diff line
@@ -2351,7 +2351,7 @@ out: 
 * For moronic filesystems that do not allow holes in file.

 * We may have to extend the file.

 */

int cont_write_begin_newtrunc(struct file *file, struct address_space *mapping,

int cont_write_begin(struct file *file, struct address_space *mapping,

			loff_t pos, unsigned len, unsigned flags,

			struct page **pagep, void **fsdata,

			get_block_t *get_block, loff_t *bytes)
@@ -2377,25 +2377,6 @@ int cont_write_begin_newtrunc(struct file *file, struct address_space *mapping, 
out:

	return err;

}

EXPORT_SYMBOL(cont_write_begin_newtrunc);



int cont_write_begin(struct file *file, struct address_space *mapping,

			loff_t pos, unsigned len, unsigned flags,

			struct page **pagep, void **fsdata,

			get_block_t *get_block, loff_t *bytes)

{

	int ret;



	ret = cont_write_begin_newtrunc(file, mapping, pos, len, flags,

					pagep, fsdata, get_block, bytes);

	if (unlikely(ret)) {

		loff_t isize = mapping->host->i_size;

		if (pos + len > isize)

			vmtruncate(mapping->host, isize);

	}



	return ret;

}

EXPORT_SYMBOL(cont_write_begin);



int block_prepare_write(struct page *page, unsigned from, unsigned to,

fs/fat/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static int fat_write_begin(struct file *file, struct address_space *mapping, 
	int err;



	*pagep = NULL;

	err = cont_write_begin_newtrunc(file, mapping, pos, len, flags,

	err = cont_write_begin(file, mapping, pos, len, flags,

				pagep, fsdata, fat_get_block,

				&MSDOS_I(mapping->host)->mmu_private);

	if (err < 0)

fs/hfs/inode.c

+10 −1
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE