Commit d1ea35f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.6-rc-smb3-plugfest-patches' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:
 "13 cifs/smb3 patches, most from testing at the SMB3 plugfest this week:

   - Important fix for multichannel and for modefromsid mounts.

   - Two reconnect fixes

   - Addition of SMB3 change notify support

   - Backup tools fix

   - A few additional minor debug improvements (tracepoints and
     additional logging found useful during testing this week)"

* tag '5.6-rc-smb3-plugfest-patches' of git://git.samba.org/sfrench/cifs-2.6:
  smb3: Add defines for new information level, FileIdInformation
  smb3: print warning once if posix context returned on open
  smb3: add one more dynamic tracepoint missing from strict fsync path
  cifs: fix mode bits from dir listing when mounted with modefromsid
  cifs: fix channel signing
  cifs: add SMB3 change notification support
  cifs: make multichannel warning more visible
  cifs: fix soft mounts hanging in the reconnect code
  cifs: Add tracepoints for errors on flush or fsync
  cifs: log warning message (once) if out of disk space
  cifs: fail i/o on soft mounts if sessionsetup errors out
  smb3: fix problem with null cifs super block with previous patch
  SMB3: Backup intent flag missing from some more ops
parents 5586c3c1 51d92d69

fs/cifs/cifs_ioctl.h

+6 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ struct smb3_key_debug_info { 
	__u8	smb3decryptionkey[SMB3_SIGN_KEY_SIZE];

} __packed;



struct smb3_notify {

	__u32	completion_filter;

	bool	watch_tree;

} __packed;



#define CIFS_IOCTL_MAGIC	0xCF

#define CIFS_IOC_COPYCHUNK_FILE	_IOW(CIFS_IOCTL_MAGIC, 3, int)

#define CIFS_IOC_SET_INTEGRITY  _IO(CIFS_IOCTL_MAGIC, 4)
@@ -72,3 +77,4 @@ struct smb3_key_debug_info { 
#define CIFS_ENUMERATE_SNAPSHOTS _IOR(CIFS_IOCTL_MAGIC, 6, struct smb_snapshot_array)

#define CIFS_QUERY_INFO _IOWR(CIFS_IOCTL_MAGIC, 7, struct smb_query_info)

#define CIFS_DUMP_KEY _IOWR(CIFS_IOCTL_MAGIC, 8, struct smb3_key_debug_info)

#define CIFS_IOC_NOTIFY _IOW(CIFS_IOCTL_MAGIC, 9, struct smb3_notify)

fs/cifs/cifsacl.c

+4 −10
Original line number Diff line number Diff line
@@ -1084,7 +1084,7 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
	struct cifs_ntsd *pntsd = NULL;

	int oplock = 0;

	unsigned int xid;

	int rc, create_options = 0;

	int rc;

	struct cifs_tcon *tcon;

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);

	struct cifs_fid fid;
@@ -1096,13 +1096,10 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
	tcon = tlink_tcon(tlink);

	xid = get_xid();



	if (backup_cred(cifs_sb))

		create_options |= CREATE_OPEN_BACKUP_INTENT;



	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = READ_CONTROL;

	oparms.create_options = create_options;

	oparms.create_options = cifs_create_options(cifs_sb, 0);

	oparms.disposition = FILE_OPEN;

	oparms.path = path;

	oparms.fid = &fid;
@@ -1147,7 +1144,7 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, 
{

	int oplock = 0;

	unsigned int xid;

	int rc, access_flags, create_options = 0;

	int rc, access_flags;

	struct cifs_tcon *tcon;

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);
@@ -1160,9 +1157,6 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, 
	tcon = tlink_tcon(tlink);

	xid = get_xid();



	if (backup_cred(cifs_sb))

		create_options |= CREATE_OPEN_BACKUP_INTENT;



	if (aclflag == CIFS_ACL_OWNER || aclflag == CIFS_ACL_GROUP)

		access_flags = WRITE_OWNER;

	else
@@ -1171,7 +1165,7 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, 
	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = access_flags;

	oparms.create_options = create_options;

	oparms.create_options = cifs_create_options(cifs_sb, 0);

	oparms.disposition = FILE_OPEN;

	oparms.path = path;

	oparms.fid = &fid;

fs/cifs/cifsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	buf->f_ffree = 0;	/* unlimited */



	if (server->ops->queryfs)

		rc = server->ops->queryfs(xid, tcon, buf);

		rc = server->ops->queryfs(xid, tcon, cifs_sb, buf);



	free_xid(xid);

	return 0;

fs/cifs/cifsglob.h

+6 −2
Original line number Diff line number Diff line
@@ -298,7 +298,8 @@ struct smb_version_operations { 
			     const char *, struct dfs_info3_param **,

			     unsigned int *, const struct nls_table *, int);

	/* informational QFS call */

	void (*qfs_tcon)(const unsigned int, struct cifs_tcon *);

	void (*qfs_tcon)(const unsigned int, struct cifs_tcon *,

			 struct cifs_sb_info *);

	/* check if a path is accessible or not */

	int (*is_path_accessible)(const unsigned int, struct cifs_tcon *,

				  struct cifs_sb_info *, const char *);
@@ -409,7 +410,7 @@ struct smb_version_operations { 
			       struct cifsInodeInfo *);

	/* query remote filesystem */

	int (*queryfs)(const unsigned int, struct cifs_tcon *,

		       struct kstatfs *);

		       struct cifs_sb_info *, struct kstatfs *);

	/* send mandatory brlock to the server */

	int (*mand_lock)(const unsigned int, struct cifsFileInfo *, __u64,

			 __u64, __u32, int, int, bool);
@@ -430,6 +431,8 @@ struct smb_version_operations { 
			     struct cifsFileInfo *src_file);

	int (*enum_snapshots)(const unsigned int xid, struct cifs_tcon *tcon,

			     struct cifsFileInfo *src_file, void __user *);

	int (*notify)(const unsigned int xid, struct file *pfile,

			     void __user *pbuf);

	int (*query_mf_symlink)(unsigned int, struct cifs_tcon *,

				struct cifs_sb_info *, const unsigned char *,

				char *, unsigned int *);
@@ -490,6 +493,7 @@ struct smb_version_operations { 
	/* ioctl passthrough for query_info */

	int (*ioctl_query_info)(const unsigned int xid,

				struct cifs_tcon *tcon,

				struct cifs_sb_info *cifs_sb,

				__le16 *path, int is_dir,

				unsigned long p);

	/* make unix special files (block, char, fifo, socket) */

fs/cifs/cifsproto.h

+8 −0
Original line number Diff line number Diff line
@@ -612,4 +612,12 @@ static inline int get_dfs_path(const unsigned int xid, struct cifs_ses *ses, 
}

#endif



static inline int cifs_create_options(struct cifs_sb_info *cifs_sb, int options)

{

	if (cifs_sb && (backup_cred(cifs_sb)))

		return options | CREATE_OPEN_BACKUP_INTENT;

	else

		return options;

}



#endif			/* _CIFSPROTO_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE