diff options
author | Jeff Layton <jlayton@redhat.com> | 2012-04-13 17:16:59 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2012-04-19 23:16:33 -0400 |
commit | 3af9d8f227a31e25b3110ef175d105798fc147a6 (patch) | |
tree | 0431c865502651114d43d5635802a2f949a55a7e /fs | |
parent | c6f5c93098f5577210f8f3ea22209b3f266c66af (diff) |
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: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index fae765dac934..81725e9286e9 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
@@ -2178,7 +2178,7 @@ cifs_iovec_write(struct file *file, const struct iovec *iov, | |||
2178 | unsigned long nr_pages, i; | 2178 | unsigned long nr_pages, i; |
2179 | size_t copied, len, cur_len; | 2179 | size_t copied, len, cur_len; |
2180 | ssize_t total_written = 0; | 2180 | ssize_t total_written = 0; |
2181 | loff_t offset = *poffset; | 2181 | loff_t offset; |
2182 | struct iov_iter it; | 2182 | struct iov_iter it; |
2183 | struct cifsFileInfo *open_file; | 2183 | struct cifsFileInfo *open_file; |
2184 | struct cifs_tcon *tcon; | 2184 | struct cifs_tcon *tcon; |
@@ -2200,6 +2200,7 @@ cifs_iovec_write(struct file *file, const struct iovec *iov, | |||
2200 | cifs_sb = CIFS_SB(file->f_path.dentry->d_sb); | 2200 | cifs_sb = CIFS_SB(file->f_path.dentry->d_sb); |
2201 | open_file = file->private_data; | 2201 | open_file = file->private_data; |
2202 | tcon = tlink_tcon(open_file->tlink); | 2202 | tcon = tlink_tcon(open_file->tlink); |
2203 | offset = *poffset; | ||
2203 | 2204 | ||
2204 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD) | 2205 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD) |
2205 | pid = open_file->pid; | 2206 | pid = open_file->pid; |