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

Commit 3af9d8f2 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: fix offset handling in cifs_iovec_write 



In the recent update of the cifs_iovec_write code to use async writes,
the handling of the file position was broken. That patch added a local
"offset" variable to handle the offset, and then only updated the
original "*poffset" before exiting.

Unfortunately, it copied off the original offset from the beginning,
instead of doing so after generic_write_checks had been called. Fix
this by moving the initialization of "offset" after that in the
function.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent c6f5c930

fs/cifs/file.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -2178,7 +2178,7 @@ cifs_iovec_write(struct file *file, const struct iovec *iov, 
	unsigned long nr_pages, i;

	unsigned long nr_pages, i;

	size_t copied, len, cur_len;

	size_t copied, len, cur_len;

	ssize_t total_written = 0;

	ssize_t total_written = 0;

	loff_t offset = *poffset;

	loff_t offset;

	struct iov_iter it;

	struct iov_iter it;

	struct cifsFileInfo *open_file;

	struct cifsFileInfo *open_file;

	struct cifs_tcon *tcon;

	struct cifs_tcon *tcon;
@@ -2200,6 +2200,7 @@ cifs_iovec_write(struct file *file, const struct iovec *iov, 
	cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);

	cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);

	open_file = file->private_data;

	open_file = file->private_data;

	tcon = tlink_tcon(open_file->tlink);

	tcon = tlink_tcon(open_file->tlink);

	offset = *poffset;





	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)

		pid = open_file->pid;

		pid = open_file->pid;