fs/cifs: remove obsolete __constant

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

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Steve French <sfrench@samba.org>
Cc: Jeff Layton <jlayton@poochiereds.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 10 insertions, 10 deletions

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 61d00a6e398f..fa13d5e79f64 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -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;