Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc09d141 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

fs/cifs: remove obsolete __constant 



Replace all __constant_foo to foo() except in smb2status.h (1700 lines to
update).

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Cc: Steve French <sfrench@samba.org>
Cc: Jeff Layton <jlayton@poochiereds.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6b101e2a

fs/cifs/cifsacl.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static const struct cifs_sid sid_everyone = { 
	1, 1, {0, 0, 0, 0, 0, 1}, {0} };

/* security id for Authenticated Users system group */

static const struct cifs_sid sid_authusers = {

	1, 1, {0, 0, 0, 0, 0, 5}, {__constant_cpu_to_le32(11)} };

	1, 1, {0, 0, 0, 0, 0, 5}, {cpu_to_le32(11)} };

/* group users */

static const struct cifs_sid sid_user = {1, 2 , {0, 0, 0, 0, 0, 5}, {} };

fs/cifs/cifssmb.c

+10 −10
Original line number Diff line number Diff line
@@ -2477,14 +2477,14 @@ CIFSSMBPosixLock(const unsigned int xid, struct cifs_tcon *tcon, 
		}

		parm_data = (struct cifs_posix_lock *)

			((char *)&pSMBr->hdr.Protocol + data_offset);

		if (parm_data->lock_type == __constant_cpu_to_le16(CIFS_UNLCK))

		if (parm_data->lock_type == cpu_to_le16(CIFS_UNLCK))

			pLockData->fl_type = F_UNLCK;

		else {

			if (parm_data->lock_type ==

					__constant_cpu_to_le16(CIFS_RDLCK))

					cpu_to_le16(CIFS_RDLCK))

				pLockData->fl_type = F_RDLCK;

			else if (parm_data->lock_type ==

					__constant_cpu_to_le16(CIFS_WRLCK))

					cpu_to_le16(CIFS_WRLCK))

				pLockData->fl_type = F_WRLCK;



			pLockData->fl_start = le64_to_cpu(parm_data->start);
@@ -3276,25 +3276,25 @@ CIFSSMB_set_compression(const unsigned int xid, struct cifs_tcon *tcon, 
	pSMB->compression_state = cpu_to_le16(COMPRESSION_FORMAT_DEFAULT);



	pSMB->TotalParameterCount = 0;

	pSMB->TotalDataCount = __constant_cpu_to_le32(2);

	pSMB->TotalDataCount = cpu_to_le32(2);

	pSMB->MaxParameterCount = 0;

	pSMB->MaxDataCount = 0;

	pSMB->MaxSetupCount = 4;

	pSMB->Reserved = 0;

	pSMB->ParameterOffset = 0;

	pSMB->DataCount = __constant_cpu_to_le32(2);

	pSMB->DataCount = cpu_to_le32(2);

	pSMB->DataOffset =

		cpu_to_le32(offsetof(struct smb_com_transaction_compr_ioctl_req,

				compression_state) - 4);  /* 84 */

	pSMB->SetupCount = 4;

	pSMB->SubCommand = __constant_cpu_to_le16(NT_TRANSACT_IOCTL);

	pSMB->SubCommand = cpu_to_le16(NT_TRANSACT_IOCTL);

	pSMB->ParameterCount = 0;

	pSMB->FunctionCode = __constant_cpu_to_le32(FSCTL_SET_COMPRESSION);

	pSMB->FunctionCode = cpu_to_le32(FSCTL_SET_COMPRESSION);

	pSMB->IsFsctl = 1; /* FSCTL */

	pSMB->IsRootFlag = 0;

	pSMB->Fid = fid; /* file handle always le */

	/* 3 byte pad, followed by 2 byte compress state */

	pSMB->ByteCount = __constant_cpu_to_le16(5);

	pSMB->ByteCount = cpu_to_le16(5);

	inc_rfc1001_len(pSMB, 5);



	rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
@@ -3430,10 +3430,10 @@ static __u16 ACL_to_cifs_posix(char *parm_data, const char *pACL, 
	cifs_acl->version = cpu_to_le16(1);

	if (acl_type == ACL_TYPE_ACCESS) {

		cifs_acl->access_entry_count = cpu_to_le16(count);

		cifs_acl->default_entry_count = __constant_cpu_to_le16(0xFFFF);

		cifs_acl->default_entry_count = cpu_to_le16(0xFFFF);

	} else if (acl_type == ACL_TYPE_DEFAULT) {

		cifs_acl->default_entry_count = cpu_to_le16(count);

		cifs_acl->access_entry_count = __constant_cpu_to_le16(0xFFFF);

		cifs_acl->access_entry_count = cpu_to_le16(0xFFFF);

	} else {

		cifs_dbg(FYI, "unknown ACL type %d\n", acl_type);

		return 0;

fs/cifs/sess.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static __u32 cifs_ssetup_hdr(struct cifs_ses *ses, SESSION_SETUP_ANDX *pSMB) 
					CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4,

					USHRT_MAX));

	pSMB->req.MaxMpxCount = cpu_to_le16(ses->server->maxReq);

	pSMB->req.VcNumber = __constant_cpu_to_le16(1);

	pSMB->req.VcNumber = cpu_to_le16(1);



	/* Now no need to set SMBFLG_CASELESS or obsolete CANONICAL PATH */

fs/cifs/smb2misc.c

+19 −19
Original line number Diff line number Diff line
@@ -67,27 +67,27 @@ check_smb2_hdr(struct smb2_hdr *hdr, __u64 mid) 
 *  indexed by command in host byte order

 */

static const __le16 smb2_rsp_struct_sizes[NUMBER_OF_SMB2_COMMANDS] = {

	/* SMB2_NEGOTIATE */ __constant_cpu_to_le16(65),

	/* SMB2_SESSION_SETUP */ __constant_cpu_to_le16(9),

	/* SMB2_LOGOFF */ __constant_cpu_to_le16(4),

	/* SMB2_TREE_CONNECT */ __constant_cpu_to_le16(16),

	/* SMB2_TREE_DISCONNECT */ __constant_cpu_to_le16(4),

	/* SMB2_CREATE */ __constant_cpu_to_le16(89),

	/* SMB2_CLOSE */ __constant_cpu_to_le16(60),

	/* SMB2_FLUSH */ __constant_cpu_to_le16(4),

	/* SMB2_READ */ __constant_cpu_to_le16(17),

	/* SMB2_WRITE */ __constant_cpu_to_le16(17),

	/* SMB2_LOCK */ __constant_cpu_to_le16(4),

	/* SMB2_IOCTL */ __constant_cpu_to_le16(49),

	/* SMB2_NEGOTIATE */ cpu_to_le16(65),

	/* SMB2_SESSION_SETUP */ cpu_to_le16(9),

	/* SMB2_LOGOFF */ cpu_to_le16(4),

	/* SMB2_TREE_CONNECT */ cpu_to_le16(16),

	/* SMB2_TREE_DISCONNECT */ cpu_to_le16(4),

	/* SMB2_CREATE */ cpu_to_le16(89),

	/* SMB2_CLOSE */ cpu_to_le16(60),

	/* SMB2_FLUSH */ cpu_to_le16(4),

	/* SMB2_READ */ cpu_to_le16(17),

	/* SMB2_WRITE */ cpu_to_le16(17),

	/* SMB2_LOCK */ cpu_to_le16(4),

	/* SMB2_IOCTL */ cpu_to_le16(49),

	/* BB CHECK this ... not listed in documentation */

	/* SMB2_CANCEL */ __constant_cpu_to_le16(0),

	/* SMB2_ECHO */ __constant_cpu_to_le16(4),

	/* SMB2_QUERY_DIRECTORY */ __constant_cpu_to_le16(9),

	/* SMB2_CHANGE_NOTIFY */ __constant_cpu_to_le16(9),

	/* SMB2_QUERY_INFO */ __constant_cpu_to_le16(9),

	/* SMB2_SET_INFO */ __constant_cpu_to_le16(2),

	/* SMB2_CANCEL */ cpu_to_le16(0),

	/* SMB2_ECHO */ cpu_to_le16(4),

	/* SMB2_QUERY_DIRECTORY */ cpu_to_le16(9),

	/* SMB2_CHANGE_NOTIFY */ cpu_to_le16(9),

	/* SMB2_QUERY_INFO */ cpu_to_le16(9),

	/* SMB2_SET_INFO */ cpu_to_le16(2),

	/* BB FIXME can also be 44 for lease break */

	/* SMB2_OPLOCK_BREAK */ __constant_cpu_to_le16(24)

	/* SMB2_OPLOCK_BREAK */ cpu_to_le16(24)

};



int

fs/cifs/smb2ops.c

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ smb2_clone_range(const unsigned int xid, 
		goto cchunk_out;



	/* For now array only one chunk long, will make more flexible later */

	pcchunk->ChunkCount = __constant_cpu_to_le32(1);

	pcchunk->ChunkCount = cpu_to_le32(1);

	pcchunk->Reserved = 0;

	pcchunk->Reserved2 = 0;