Commit 8b614cb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2873dc25 fb4b5f13

fs/cifs/cifs_dfs_ref.c

+2 −0
Original line number Diff line number Diff line
@@ -324,6 +324,8 @@ static struct vfsmount *cifs_dfs_do_automount(struct dentry *mntpt) 
	if (full_path == NULL)

		goto cdda_exit;



	convert_delimiter(full_path, '\\');



	cifs_dbg(FYI, "%s: full_path: %s\n", __func__, full_path);



	if (!cifs_sb_master_tlink(cifs_sb)) {

fs/cifs/cifsfs.c

+2 −0
Original line number Diff line number Diff line
@@ -530,6 +530,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 


	if (tcon->seal)

		seq_puts(s, ",seal");

	else if (tcon->ses->server->ignore_signature)

		seq_puts(s, ",signloosely");

	if (tcon->nocase)

		seq_puts(s, ",nocase");

	if (tcon->local_lease)

fs/cifs/cifsglob.h

+7 −0
Original line number Diff line number Diff line
@@ -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

fs/cifs/cifsproto.h

+3 −2
Original line number Diff line number Diff line
@@ -134,11 +134,12 @@ extern bool backup_cred(struct cifs_sb_info *); 
extern bool is_size_safe_to_change(struct cifsInodeInfo *, __u64 eof);

extern void cifs_update_eof(struct cifsInodeInfo *cifsi, loff_t offset,

			    unsigned int bytes_written);

extern struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *, bool);

extern struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *, int);

extern int cifs_get_writable_file(struct cifsInodeInfo *cifs_inode,

				  bool fsuid_only,

				  int flags,

				  struct cifsFileInfo **ret_file);

extern int cifs_get_writable_path(struct cifs_tcon *tcon, const char *name,

				  int flags,

				  struct cifsFileInfo **ret_file);

extern struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *, bool);

extern int cifs_get_readable_path(struct cifs_tcon *tcon, const char *name,

fs/cifs/cifssmb.c

+2 −1
Original line number Diff line number Diff line
@@ -1492,6 +1492,7 @@ openRetry: 
	*oplock = rsp->OplockLevel;

	/* cifs fid stays in le */

	oparms->fid->netfid = rsp->Fid;

	oparms->fid->access = desired_access;



	/* Let caller know file was created so we can set the mode. */

	/* Do we care about the CreateAction in any other cases? */
@@ -2115,7 +2116,7 @@ cifs_writev_requeue(struct cifs_writedata *wdata) 
		wdata2->tailsz = tailsz;

		wdata2->bytes = cur_len;



		rc = cifs_get_writable_file(CIFS_I(inode), false,

		rc = cifs_get_writable_file(CIFS_I(inode), FIND_WR_ANY,

					    &wdata2->cfile);

		if (!wdata2->cfile) {

			cifs_dbg(VFS, "No writable handle to retry writepages rc=%d\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE