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

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

fs: fix kernel_write prototype 



Make the position an in/out argument like all the other read/write
helpers and and make the buf argument a void pointer.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent bdd1d2d3

drivers/mtd/nand/nandsim.c

+1 −1
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ static ssize_t write_file(struct nandsim *ns, struct file *file, void *buf, size 
	if (err)

		return err;

	noreclaim_flag = memalloc_noreclaim_save();

	tx = kernel_write(file, buf, count, pos);

	tx = kernel_write(file, buf, count, &pos);

	memalloc_noreclaim_restore(noreclaim_flag);

	put_pages(ns);

	return tx;

drivers/target/target_core_alua.c

+2 −1
Original line number Diff line number Diff line
@@ -896,13 +896,14 @@ static int core_alua_write_tpg_metadata( 
	u32 md_buf_len)

{

	struct file *file = filp_open(path, O_RDWR | O_CREAT | O_TRUNC, 0600);

	loff_t pos = 0;

	int ret;



	if (IS_ERR(file)) {

		pr_err("filp_open(%s) for ALUA metadata failed\n", path);

		return -ENODEV;

	}

	ret = kernel_write(file, md_buf, md_buf_len, 0);

	ret = kernel_write(file, md_buf, md_buf_len, &pos);

	if (ret < 0)

		pr_err("Error writing ALUA metadata file: %s\n", path);

	fput(file);

drivers/target/target_core_file.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ fd_do_prot_fill(struct se_device *se_dev, sector_t lba, sector_t nolb, 


	for (prot = 0; prot < prot_length;) {

		sector_t len = min_t(sector_t, bufsize, prot_length - prot);

		ssize_t ret = kernel_write(prot_fd, buf, len, pos + prot);

		ssize_t ret = kernel_write(prot_fd, buf, len, &pos);



		if (ret != len) {

			pr_err("vfs_write to prot file failed: %zd\n", ret);

drivers/target/target_core_pr.c

+2 −1
Original line number Diff line number Diff line
@@ -1974,6 +1974,7 @@ static int __core_scsi3_write_aptpl_to_file( 
	char path[512];

	u32 pr_aptpl_buf_len;

	int ret;

	loff_t pos = 0;



	memset(path, 0, 512);
@@ -1993,7 +1994,7 @@ static int __core_scsi3_write_aptpl_to_file( 


	pr_aptpl_buf_len = (strlen(buf) + 1); /* Add extra for NULL */



	ret = kernel_write(file, buf, pr_aptpl_buf_len, 0);

	ret = kernel_write(file, buf, pr_aptpl_buf_len, &pos);



	if (ret < 0)

		pr_debug("Error writing APTPL metadata file: %s\n", path);

fs/ecryptfs/read_write.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data, 
	lower_file = ecryptfs_inode_to_private(ecryptfs_inode)->lower_file;

	if (!lower_file)

		return -EIO;

	rc = kernel_write(lower_file, data, size, offset);

	rc = kernel_write(lower_file, data, size, &offset);

	mark_inode_dirty_sync(ecryptfs_inode);

	return rc;

}