diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2019-05-03 17:05:37 -0500 |
|---|---|---|
| committer | Tom Zanussi <tom.zanussi@linux.intel.com> | 2019-05-03 17:05:37 -0500 |
| commit | b5e26eb6435cb25b2087b8295bbb7b885d134102 (patch) | |
| tree | c5d4282e482c16057165cc60201c119e63d6f9c9 /fs/cifs | |
| parent | 997f3e86b613be529c5e97caeac52631ab794ff2 (diff) | |
| parent | 1c046f37313210e0c41b036fcd14c4bdb1581d47 (diff) | |
| download | linux-rt-b5e26eb6435cb25b2087b8295bbb7b885d134102.tar.gz | |
Merge tag 'v4.14.115' into v4.14-rt
This is the 4.14.115 stable release
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/inode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 6fd4a6a75234..e7192ee7a89c 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -1730,6 +1730,10 @@ cifs_do_rename(const unsigned int xid, struct dentry *from_dentry, if (rc == 0 || rc != -EBUSY) goto do_rename_exit; + /* Don't fall back to using SMB on SMB 2+ mount */ + if (server->vals->protocol_id != 0) + goto do_rename_exit; + /* open-file renames don't work across directories */ if (to_dentry->d_parent != from_dentry->d_parent) goto do_rename_exit; |