Commit 7fc7cd00 authored by Marco Stornelli's avatar Marco Stornelli Committed by Al Viro
Browse files

minix: drop vmtruncate 



Removed vmtruncate

Signed-off-by: default avatarMarco Stornelli <marco.stornelli@gmail.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5dfc2821

fs/minix/file.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -34,9 +34,12 @@ static int minix_setattr(struct dentry *dentry, struct iattr *attr) 




	if ((attr->ia_valid & ATTR_SIZE) &&

	if ((attr->ia_valid & ATTR_SIZE) &&

	    attr->ia_size != i_size_read(inode)) {

	    attr->ia_size != i_size_read(inode)) {

		error = vmtruncate(inode, attr->ia_size);

		error = inode_newsize_ok(inode, attr->ia_size);

		if (error)

		if (error)

			return error;

			return error;



		truncate_setsize(inode, attr->ia_size);

		minix_truncate(inode);

	}

	}





	setattr_copy(inode, attr);

	setattr_copy(inode, attr);
@@ -45,7 +48,6 @@ static int minix_setattr(struct dentry *dentry, struct iattr *attr) 
}

}





const struct inode_operations minix_file_inode_operations = {

const struct inode_operations minix_file_inode_operations = {

	.truncate	= minix_truncate,

	.setattr	= minix_setattr,

	.setattr	= minix_setattr,

	.getattr	= minix_getattr,

	.getattr	= minix_getattr,

};
 
};

fs/minix/inode.c

+12 −5
Original line number Original line Diff line number Diff line
@@ -395,6 +395,16 @@ int minix_prepare_chunk(struct page *page, loff_t pos, unsigned len) 
	return __block_write_begin(page, pos, len, minix_get_block);

	return __block_write_begin(page, pos, len, minix_get_block);

}

}





static void minix_write_failed(struct address_space *mapping, loff_t to)

{

	struct inode *inode = mapping->host;



	if (to > inode->i_size) {

		truncate_pagecache(inode, to, inode->i_size);

		minix_truncate(inode);

	}

}



static int minix_write_begin(struct file *file, struct address_space *mapping,

static int minix_write_begin(struct file *file, struct address_space *mapping,

			loff_t pos, unsigned len, unsigned flags,

			loff_t pos, unsigned len, unsigned flags,

			struct page **pagep, void **fsdata)

			struct page **pagep, void **fsdata)
@@ -403,11 +413,8 @@ static int minix_write_begin(struct file *file, struct address_space *mapping, 




	ret = block_write_begin(mapping, pos, len, flags, pagep,

	ret = block_write_begin(mapping, pos, len, flags, pagep,

				minix_get_block);

				minix_get_block);

	if (unlikely(ret)) {

	if (unlikely(ret))

		loff_t isize = mapping->host->i_size;

		minix_write_failed(mapping, pos + len);

		if (pos + len > isize)

			vmtruncate(mapping->host, isize);

	}





	return ret;

	return ret;

}

}