diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-03 17:31:19 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-03 17:31:19 -0600 |
| commit | 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 (patch) | |
| tree | 810fb619ff3f91be8d6ed3668a6bbcedc608f0f4 /fs/cifs/cifsglob.h | |
| parent | 2873dc25477f483997c99981cf14b43a0d4f84d4 (diff) | |
| parent | fb4b5f13464c468a9c10ae1ab8ba9aa352d0256a (diff) | |
| download | linux-stable-8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238.tar.gz linux-stable-8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238.tar.bz2 linux-stable-8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238.zip | |
Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French:
"Five small cifs/smb3 fixes, two for stable (one for a reconnect
problem and the other fixes a use case when renaming an open file)"
* tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
cifs: Use #define in cifs_dbg
cifs: fix rename() by ensuring source handle opened with DELETE bit
cifs: add missing mount option to /proc/mounts
cifs: fix potential mismatch of UNC paths
cifs: don't leak -EAGAIN for stat() during reconnect
Diffstat (limited to 'fs/cifs/cifsglob.h')
| -rw-r--r-- | fs/cifs/cifsglob.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index de82cfa44b1a..0d956360e984 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -1281,6 +1281,7 @@ struct cifs_fid { __u64 volatile_fid; /* volatile file id for smb2 */ __u8 lease_key[SMB2_LEASE_KEY_SIZE]; /* lease key for smb2 */ __u8 create_guid[16]; + __u32 access; struct cifs_pending_open *pending_open; unsigned int epoch; #ifdef CONFIG_CIFS_DEBUG2 @@ -1741,6 +1742,12 @@ static inline bool is_retryable_error(int error) return false; } + +/* cifs_get_writable_file() flags */ +#define FIND_WR_ANY 0 +#define FIND_WR_FSUID_ONLY 1 +#define FIND_WR_WITH_DELETE 2 + #define MID_FREE 0 #define MID_REQUEST_ALLOCATED 1 #define MID_REQUEST_SUBMITTED 2 |