diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-07 16:06:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-07 16:06:14 -0700 |
| commit | 8dc5b3a6cb2fc5d4f751bda56a378589202a118b (patch) | |
| tree | cae239c16625ecb15ebc4b94535f46ea064bfd47 /fs/cifs/xattr.c | |
| parent | 2500e287bca1beb313aa298f2d36be1257cbb483 (diff) | |
| parent | 76e752701a8af4404bbd9c45723f7cbd6e4a251e (diff) | |
| download | linux-8dc5b3a6cb2fc5d4f751bda56a378589202a118b.tar.bz2 | |
Merge tag '4.14-smb3-xattr-enable' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs update from Steve French:
"Enable xattr support for smb3 and also a bugfix"
* tag '4.14-smb3-xattr-enable' of git://git.samba.org/sfrench/cifs-2.6:
cifs: Check for timeout on Negotiate stage
cifs: Add support for writing attributes on SMB2+
cifs: Add support for reading attributes on SMB2+
Diffstat (limited to 'fs/cifs/xattr.c')
| -rw-r--r-- | fs/cifs/xattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c index de50e749ff05..52f975d848a0 100644 --- a/fs/cifs/xattr.c +++ b/fs/cifs/xattr.c @@ -84,7 +84,7 @@ static int cifs_xattr_set(const struct xattr_handler *handler, if (pTcon->ses->server->ops->set_EA) rc = pTcon->ses->server->ops->set_EA(xid, pTcon, full_path, name, value, (__u16)size, - cifs_sb->local_nls, cifs_remap(cifs_sb)); + cifs_sb->local_nls, cifs_sb); break; case XATTR_CIFS_ACL: { |