diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 11:16:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 11:16:29 -0700 |
| commit | 6fd4e7f7744bd7859ca3cae19c4613252ebb6bff (patch) | |
| tree | 2d8bd695f467d991f4de5fedf3d210e5f39c093f /fs/cifs/ioctl.c | |
| parent | 5958cc49ed2961a059d92ae55afeeaba64a783a0 (diff) | |
| parent | a6f74e80f271b19ea709cbda55e8eb67e9ffccf2 (diff) | |
| download | linux-6fd4e7f7744bd7859ca3cae19c4613252ebb6bff.tar.bz2 | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French:
"Three cifs/smb3 fixes - including two for stable"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
cifs: don't check for failure from mempool_alloc()
Do not return number of bytes written for ioctl CIFS_IOC_COPYCHUNK_FILE
Fix match_prepath()
Diffstat (limited to 'fs/cifs/ioctl.c')
| -rw-r--r-- | fs/cifs/ioctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c index 265c45fe4ea5..7f4bba574930 100644 --- a/fs/cifs/ioctl.c +++ b/fs/cifs/ioctl.c @@ -74,7 +74,8 @@ static long cifs_ioctl_copychunk(unsigned int xid, struct file *dst_file, rc = cifs_file_copychunk_range(xid, src_file.file, 0, dst_file, 0, src_inode->i_size, 0); - + if (rc > 0) + rc = 0; out_fput: fdput(src_file); out_drop_write: |