diff options
| author | Amir Goldstein <amir73il@gmail.com> | 2019-06-10 19:36:57 +0200 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2019-07-18 21:03:03 +0200 |
| commit | bf3c90ee1efe4dd3417d2129f9f6c68a4c76de00 (patch) | |
| tree | cea2317aa589975e3a9f94b75ef292f1d5912717 /fs | |
| parent | CIFS: fix deadlock in cached root handling (diff) | |
| download | linux-bf3c90ee1efe4dd3417d2129f9f6c68a4c76de00.tar.xz linux-bf3c90ee1efe4dd3417d2129f9f6c68a4c76de00.zip | |
cifs: copy_file_range needs to strip setuid bits and update timestamps
cifs has both source and destination inodes locked throughout the copy.
Like ->write_iter(), we update mtime and strip setuid bits of destination
file before copy and like ->read_iter(), we update atime of source file
after copy.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/cifsfs.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 270d3c58fb3b..3289b566463f 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -1104,6 +1104,10 @@ ssize_t cifs_file_copychunk_range(unsigned int xid, goto out; } + rc = -EOPNOTSUPP; + if (!target_tcon->ses->server->ops->copychunk_range) + goto out; + /* * Note: cifs case is easier than btrfs since server responsible for * checks for proper open modes and file type and if it wants @@ -1115,11 +1119,12 @@ ssize_t cifs_file_copychunk_range(unsigned int xid, /* should we flush first and last page first */ truncate_inode_pages(&target_inode->i_data, 0); - if (target_tcon->ses->server->ops->copychunk_range) + rc = file_modified(dst_file); + if (!rc) rc = target_tcon->ses->server->ops->copychunk_range(xid, smb_file_src, smb_file_target, off, len, destoff); - else - rc = -EOPNOTSUPP; + + file_accessed(src_file); /* force revalidate of size and timestamps of target file now * that target is updated on the server |