Commit 67b4c889 authored by Steve French's avatar Steve French
Browse files

[CIFS] Minor cleanup of xattr query function 



Some minor cleanup of cifs query xattr functions (will also make
SMB3 xattr implementation cleaner as well).

Signed-off-by: default avatarSteve French <steve.french@primarydata.com>
parent 4328fea7

fs/cifs/cifsglob.h

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ struct smb_version_operations { 
	int (*validate_negotiate)(const unsigned int, struct cifs_tcon *);

	ssize_t (*query_all_EAs)(const unsigned int, struct cifs_tcon *,

			const unsigned char *, const unsigned char *, char *,

			size_t, const struct nls_table *, int);

			size_t, struct cifs_sb_info *);

	int (*set_EA)(const unsigned int, struct cifs_tcon *, const char *,

			const char *, const void *, const __u16,

			const struct nls_table *, int);

fs/cifs/cifsproto.h

+1 −2
Original line number Diff line number Diff line
@@ -480,8 +480,7 @@ extern int CIFSSMBCopy(unsigned int xid, 
extern ssize_t CIFSSMBQAllEAs(const unsigned int xid, struct cifs_tcon *tcon,

			const unsigned char *searchName,

			const unsigned char *ea_name, char *EAData,

			size_t bufsize, const struct nls_table *nls_codepage,

			int remap_special_chars);

			size_t bufsize, struct cifs_sb_info *cifs_sb);

extern int CIFSSMBSetEA(const unsigned int xid, struct cifs_tcon *tcon,

		const char *fileName, const char *ea_name,

		const void *ea_value, const __u16 ea_value_len,

fs/cifs/cifssmb.c

+3 −1
Original line number Diff line number Diff line
@@ -6069,11 +6069,13 @@ ssize_t 
CIFSSMBQAllEAs(const unsigned int xid, struct cifs_tcon *tcon,

		const unsigned char *searchName, const unsigned char *ea_name,

		char *EAData, size_t buf_size,

		const struct nls_table *nls_codepage, int remap)

		struct cifs_sb_info *cifs_sb)

{

		/* BB assumes one setup word */

	TRANSACTION2_QPI_REQ *pSMB = NULL;

	TRANSACTION2_QPI_RSP *pSMBr = NULL;

	int remap = cifs_remap(cifs_sb);

	struct nls_table *nls_codepage = cifs_sb->local_nls;

	int rc = 0;

	int bytes_returned;

	int list_len;

fs/cifs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -563,8 +563,7 @@ static int cifs_sfu_mode(struct cifs_fattr *fattr, const unsigned char *path, 


	rc = tcon->ses->server->ops->query_all_EAs(xid, tcon, path,

			"SETFILEBITS", ea_value, 4 /* size of buf */,

			cifs_sb->local_nls,

			cifs_remap(cifs_sb));

			cifs_sb);

	cifs_put_tlink(tlink);

	if (rc < 0)

		return (int)rc;

fs/cifs/xattr.c

+2 −4
Original line number Diff line number Diff line
@@ -235,8 +235,7 @@ static int cifs_xattr_get(const struct xattr_handler *handler, 


		if (pTcon->ses->server->ops->query_all_EAs)

			rc = pTcon->ses->server->ops->query_all_EAs(xid, pTcon,

				full_path, name, value, size,

				cifs_sb->local_nls, cifs_remap(cifs_sb));

				full_path, name, value, size, cifs_sb);

		break;



	case XATTR_CIFS_ACL: {
@@ -336,8 +335,7 @@ ssize_t cifs_listxattr(struct dentry *direntry, char *data, size_t buf_size) 


	if (pTcon->ses->server->ops->query_all_EAs)

		rc = pTcon->ses->server->ops->query_all_EAs(xid, pTcon,

				full_path, NULL, data, buf_size,

				cifs_sb->local_nls, cifs_remap(cifs_sb));

				full_path, NULL, data, buf_size, cifs_sb);

list_ea_exit:

	kfree(full_path);

	free_xid(xid);