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

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

sysv: 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 83f6e371

fs/sysv/file.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -41,9 +41,11 @@ static int sysv_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);

		sysv_truncate(inode);

	}

	}





	setattr_copy(inode, attr);

	setattr_copy(inode, attr);
@@ -52,7 +54,6 @@ static int sysv_setattr(struct dentry *dentry, struct iattr *attr) 
}

}





const struct inode_operations sysv_file_inode_operations = {

const struct inode_operations sysv_file_inode_operations = {

	.truncate	= sysv_truncate,

	.setattr	= sysv_setattr,

	.setattr	= sysv_setattr,

	.getattr	= sysv_getattr,

	.getattr	= sysv_getattr,

};
 
};

fs/sysv/itree.c

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

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

}

}





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

		sysv_truncate(inode);

	}

}



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

static int sysv_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)
@@ -471,11 +481,8 @@ static int sysv_write_begin(struct file *file, struct address_space *mapping, 
	int ret;

	int ret;





	ret = block_write_begin(mapping, pos, len, flags, pagep, get_block);

	ret = block_write_begin(mapping, pos, len, flags, pagep, get_block);

	if (unlikely(ret)) {

	if (unlikely(ret))

		loff_t isize = mapping->host->i_size;

		sysv_write_failed(mapping, pos + len);

		if (pos + len > isize)

			vmtruncate(mapping->host, isize);

	}





	return ret;

	return ret;

}

}