Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dc1834f authored by Marco Stornelli's avatar Marco Stornelli Committed by Al Viro
Browse files

affs: 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 62295183

fs/affs/file.c

+12 −6
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ const struct file_operations affs_file_operations = { 
};



const struct inode_operations affs_file_inode_operations = {

	.truncate	= affs_truncate,

	.setattr	= affs_notify_change,

};
@@ -402,6 +401,16 @@ static int affs_readpage(struct file *file, struct page *page) 
	return block_read_full_page(page, affs_get_block);

}



static void affs_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);

		affs_truncate(inode);

	}

}



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

			loff_t pos, unsigned len, unsigned flags,

			struct page **pagep, void **fsdata)
@@ -412,11 +421,8 @@ static int affs_write_begin(struct file *file, struct address_space *mapping, 
	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);

	}

	if (unlikely(ret))

		affs_write_failed(mapping, pos + len);



	return ret;

}

fs/affs/inode.c

+4 −1
Original line number Diff line number Diff line
@@ -237,9 +237,12 @@ affs_notify_change(struct dentry *dentry, struct iattr *attr) 


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

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

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

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

		if (error)

			return error;



		truncate_setsize(inode, attr->ia_size);

		affs_truncate(inode);

	}



	setattr_copy(inode, attr);