diff options
| author | Linus Torvalds | 2016-05-18 19:01:47 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-05-18 19:01:47 +0200 |
| commit | 8908c94d6cd7513ba4512295abc945a6ff7f979c (patch) | |
| tree | 5f987d0db14d301001621fd2085471a0c2331f8b /fs/cifs/smb2proto.h | |
| parent | Merge branch 'for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/li... (diff) | |
| parent | remove directory incorrectly tries to set delete on close on non-empty direct... (diff) | |
| download | kernel-qcow2-linux-8908c94d6cd7513ba4512295abc945a6ff7f979c.tar.gz kernel-qcow2-linux-8908c94d6cd7513ba4512295abc945a6ff7f979c.tar.xz kernel-qcow2-linux-8908c94d6cd7513ba4512295abc945a6ff7f979c.zip | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs updates from Steve French:
"Various small CIFS and SMB3 fixes (including some for stable)"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
remove directory incorrectly tries to set delete on close on non-empty directories
Update cifs.ko version to 2.09
fs/cifs: correctly to anonymous authentication for the NTLM(v2) authentication
fs/cifs: correctly to anonymous authentication for the NTLM(v1) authentication
fs/cifs: correctly to anonymous authentication for the LANMAN authentication
fs/cifs: correctly to anonymous authentication via NTLMSSP
cifs: remove any preceding delimiter from prefix_path
cifs: Use file_dentry()
Diffstat (limited to 'fs/cifs/smb2proto.h')
| -rw-r--r-- | fs/cifs/smb2proto.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h index 4f07dc93608d..eb2cde2f64ba 100644 --- a/fs/cifs/smb2proto.h +++ b/fs/cifs/smb2proto.h @@ -141,6 +141,8 @@ extern int SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon, extern int SMB2_rename(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, u64 volatile_fid, __le16 *target_file); +extern int SMB2_rmdir(const unsigned int xid, struct cifs_tcon *tcon, + u64 persistent_fid, u64 volatile_fid); extern int SMB2_set_hardlink(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, u64 volatile_fid, __le16 *target_file); |