1 files changed, 161 insertions, 136 deletions

diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h
index d619ca7d1416..6a2056e58ceb 100644
--- a/fs/cifs/cifspdu.h
+++ b/fs/cifs/cifspdu.h
@@ -144,7 +144,7 @@
 #define SMBOPEN_OAPPEND       0x0001
 
 /*
- * SMB flag definitions 
+ * SMB flag definitions
  */
 #define SMBFLG_EXTD_LOCK 0x01   /* server supports lock-read write-unlock smb */
 #define SMBFLG_RCV_POSTED 0x02  /* obsolete */
@@ -157,9 +157,9 @@
 #define SMBFLG_RESPONSE 0x80    /* this PDU is a response from server */
 
 /*
- * SMB flag2 definitions 
+ * SMB flag2 definitions
  */
-#define SMBFLG2_KNOWS_LONG_NAMES cpu_to_le16(1) /* can send long (non-8.3) 
+#define SMBFLG2_KNOWS_LONG_NAMES cpu_to_le16(1) /* can send long (non-8.3)
                                                    path names in response */
 #define SMBFLG2_KNOWS_EAS cpu_to_le16(2)
 #define SMBFLG2_SECURITY_SIGNATURE cpu_to_le16(4)
@@ -260,7 +260,7 @@
 #define ATTR_SPARSE    0x0200
 #define ATTR_REPARSE   0x0400
 #define ATTR_COMPRESSED 0x0800
-#define ATTR_OFFLINE    0x1000  /* ie file not immediately available - 
+#define ATTR_OFFLINE    0x1000  /* ie file not immediately available -
                                         on offline storage */
 #define ATTR_NOT_CONTENT_INDEXED 0x2000
 #define ATTR_ENCRYPTED  0x4000
@@ -300,7 +300,7 @@
 #define CREATE_DELETE_ON_CLOSE  0x00001000
 #define CREATE_OPEN_BY_ID       0x00002000
 #define OPEN_REPARSE_POINT      0x00200000
-#define CREATE_OPTIONS_MASK     0x007FFFFF 
+#define CREATE_OPTIONS_MASK     0x007FFFFF
 #define CREATE_OPTION_SPECIAL   0x20000000   /* system. NB not sent over wire */
 
 /* ImpersonationLevel flags */
@@ -366,17 +366,19 @@ struct smb_hdr {
 #define pByteArea(smb_var) ((unsigned char *)smb_var + sizeof(struct smb_hdr) + (2* smb_var->WordCount) + 2 )
 
 /*
- * Computer Name Length
+ * Computer Name Length (since Netbios name was length 16 with last byte 0x20)
+ * No longer as important, now that TCP names are more commonly used to
+ * resolve hosts.
  */
 #define CNLEN 15
 
 /*
- * Share Name Length                                      @S8A
- * Note:  This length is limited by the SMB used to get   @S8A
- *        the Share info.   NetShareEnum only returns 13  @S8A
- *        chars, including the null termination.          @S8A 
+ * Share Name Length (SNLEN)
+ * Note:  This length was limited by the SMB used to get
+ *        the Share info.   NetShareEnum only returned 13
+ *        chars, including the null termination.
+ * This was removed because it no longer is limiting.
  */
-#define SNLEN 12                /*@S8A */
 
 /*
  * Comment Length
@@ -394,8 +396,8 @@ struct smb_hdr {
  *
  *  The Naming convention is the lower case version of the
  *  smb command code name for the struct and this is typedef to the
- *  uppercase version of the same name with the prefix SMB_ removed 
- *  for brevity.  Although typedefs are not commonly used for 
+ *  uppercase version of the same name with the prefix SMB_ removed
+ *  for brevity.  Although typedefs are not commonly used for
  *  structure definitions in the Linux kernel, their use in the
  *  CIFS standards document, which this code is based on, may
  *  make this one of the cases where typedefs for structures make
@@ -403,7 +405,7 @@ struct smb_hdr {
  *  Typedefs can always be removed later if they are too distracting
  *  and they are only used for the CIFSs PDUs themselves, not
  *  internal cifs vfs structures
- *  
+ *
  */
 
 typedef struct negotiate_req {
@@ -511,7 +513,7 @@ typedef union smb_com_session_setup_andx {
                 unsigned char SecurityBlob[1];  /* followed by */
                 /* STRING NativeOS */
                 /* STRING NativeLanMan */
-        } __attribute__((packed)) req;  /* NTLM request format (with 
+        } __attribute__((packed)) req;  /* NTLM request format (with
                                         extended security */
 
         struct {                /* request format */
@@ -549,7 +551,7 @@ typedef union smb_com_session_setup_andx {
 /*      unsigned char  * NativeOS;      */
 /*      unsigned char  * NativeLanMan;  */
 /*      unsigned char  * PrimaryDomain; */
-        } __attribute__((packed)) resp; /* NTLM response 
+        } __attribute__((packed)) resp; /* NTLM response
                                            (with or without extended sec) */
 
         struct {                /* request format */
@@ -618,7 +620,7 @@ struct ntlmv2_resp {
 #define CAP_NT_SMBS            0x00000010
 #define CAP_STATUS32           0x00000040
 #define CAP_LEVEL_II_OPLOCKS   0x00000080
-#define CAP_NT_FIND            0x00000200       /* reserved should be zero 
+#define CAP_NT_FIND            0x00000200       /* reserved should be zero
                                 (because NT_SMBs implies the same thing?) */
 #define CAP_BULK_TRANSFER      0x20000000
 #define CAP_EXTENDED_SECURITY  0x80000000
@@ -676,7 +678,7 @@ typedef struct smb_com_logoff_andx_rsp {
         __u16 ByteCount;
 } __attribute__((packed)) LOGOFF_ANDX_RSP;
 
-typedef union smb_com_tree_disconnect { /* as an altetnative can use flag on 
+typedef union smb_com_tree_disconnect { /* as an altetnative can use flag on
                                         tree_connect PDU to effect disconnect */
                                         /* tdis is probably simplest SMB PDU */
         struct {
@@ -712,6 +714,7 @@ typedef struct smb_com_findclose_req {
 #define REQ_OPLOCK         0x00000002
 #define REQ_BATCHOPLOCK    0x00000004
 #define REQ_OPENDIRONLY    0x00000008
+#define REQ_EXTENDED_INFO  0x00000010
 
 typedef struct smb_com_open_req {       /* also handles create */
         struct smb_hdr hdr;     /* wct = 24 */
@@ -799,27 +802,28 @@ typedef struct smb_com_openx_rsp {
         __u32  FileId;
         __u16  Reserved;
         __u16  ByteCount;
-} __attribute__((packed)) OPENX_RSP; 
+} __attribute__((packed)) OPENX_RSP;
 
 /* For encoding of POSIX Open Request - see trans2 function 0x209 data struct */
 
 /* Legacy write request for older servers */
 typedef struct smb_com_writex_req {
-        struct smb_hdr hdr;     /* wct = 12 */
-        __u8 AndXCommand;
-        __u8 AndXReserved;
-        __le16 AndXOffset;
-        __u16 Fid;
-        __le32 OffsetLow;
-        __u32 Reserved; /* Timeout */
-        __le16 WriteMode; /* 1 = write through */
-        __le16 Remaining;
-        __le16 Reserved2;
-        __le16 DataLengthLow;
-        __le16 DataOffset;
-        __le16 ByteCount;
-        __u8 Pad;               /* BB check for whether padded to DWORD boundary and optimum performance here */
-        char Data[0];
+        struct smb_hdr hdr;     /* wct = 12 */
+        __u8 AndXCommand;
+        __u8 AndXReserved;
+        __le16 AndXOffset;
+        __u16 Fid;
+        __le32 OffsetLow;
+        __u32 Reserved; /* Timeout */
+        __le16 WriteMode; /* 1 = write through */
+        __le16 Remaining;
+        __le16 Reserved2;
+        __le16 DataLengthLow;
+        __le16 DataOffset;
+        __le16 ByteCount;
+        __u8 Pad;               /* BB check for whether padded to DWORD
+                                   boundary and optimum performance here */
+        char Data[0];
 } __attribute__((packed)) WRITEX_REQ;
 
 typedef struct smb_com_write_req {
@@ -837,7 +841,8 @@ typedef struct smb_com_write_req {
         __le16 DataOffset;
         __le32 OffsetHigh;
         __le16 ByteCount;
-        __u8 Pad;               /* BB check for whether padded to DWORD boundary and optimum performance here */
+        __u8 Pad;               /* BB check for whether padded to DWORD
+                                   boundary and optimum performance here */
         char Data[0];
 } __attribute__((packed)) WRITE_REQ;
 
@@ -855,17 +860,17 @@ typedef struct smb_com_write_rsp {
 
 /* legacy read request for older servers */
 typedef struct smb_com_readx_req {
-        struct smb_hdr hdr;     /* wct = 10 */
-        __u8 AndXCommand;
-        __u8 AndXReserved;
-        __le16 AndXOffset;
-        __u16 Fid;
-        __le32 OffsetLow;
-        __le16 MaxCount;
-        __le16 MinCount;                /* obsolete */
-        __le32 Reserved;
-        __le16 Remaining;
-        __le16 ByteCount;
+        struct smb_hdr hdr;     /* wct = 10 */
+        __u8 AndXCommand;
+        __u8 AndXReserved;
+        __le16 AndXOffset;
+        __u16 Fid;
+        __le32 OffsetLow;
+        __le16 MaxCount;
+        __le16 MinCount;        /* obsolete */
+        __le32 Reserved;
+        __le16 Remaining;
+        __le16 ByteCount;
 } __attribute__((packed)) READX_REQ;
 
 typedef struct smb_com_read_req {
@@ -896,7 +901,8 @@ typedef struct smb_com_read_rsp {
         __le16 DataLengthHigh;
         __u64 Reserved2;
         __u16 ByteCount;
-        __u8 Pad;               /* BB check for whether padded to DWORD boundary and optimum performance here */
+        __u8 Pad;               /* BB check for whether padded to DWORD
+                                   boundary and optimum performance here */
         char Data[1];
 } __attribute__((packed)) READ_RSP;
 
@@ -967,7 +973,7 @@ typedef struct smb_com_rename_req {
 #define COPY_TARGET_MODE_ASCII 0x0004 /* if not set, binary */
 #define COPY_SOURCE_MODE_ASCII 0x0008 /* if not set, binary */
 #define COPY_VERIFY_WRITES     0x0010
-#define COPY_TREE              0x0020 
+#define COPY_TREE              0x0020
 
 typedef struct smb_com_copy_req {
         struct smb_hdr hdr;     /* wct = 3 */
@@ -975,7 +981,7 @@ typedef struct smb_com_copy_req {
         __le16 OpenFunction;
         __le16 Flags;
         __le16 ByteCount;
-        __u8 BufferFormat;      /* 4 = ASCII or Unicode */ 
+        __u8 BufferFormat;      /* 4 = ASCII or Unicode */
         unsigned char OldFileName[1];
         /* followed by __u8 BufferFormat2 */
         /* followed by NewFileName string */
@@ -1083,28 +1089,28 @@ typedef struct smb_com_setattr_rsp {
 
 /*******************************************************/
 /* NT Transact structure defintions follow             */
-/* Currently only ioctl, acl (get security descriptor) */  
+/* Currently only ioctl, acl (get security descriptor) */
 /* and notify are implemented                          */
 /*******************************************************/
 typedef struct smb_com_ntransact_req {
-        struct smb_hdr hdr; /* wct >= 19 */
-        __u8 MaxSetupCount;
-        __u16 Reserved;
-        __le32 TotalParameterCount;
-        __le32 TotalDataCount;
-        __le32 MaxParameterCount;
-        __le32 MaxDataCount;
-        __le32 ParameterCount;
-        __le32 ParameterOffset;
-        __le32 DataCount;
-        __le32 DataOffset;
-        __u8 SetupCount; /* four setup words follow subcommand */
-        /* SNIA spec incorrectly included spurious pad here */
-        __le16 SubCommand; /* 2 = IOCTL/FSCTL */
-        /* SetupCount words follow then */ 
-        __le16 ByteCount;
-        __u8 Pad[3];
-        __u8 Parms[0];
+        struct smb_hdr hdr; /* wct >= 19 */
+        __u8 MaxSetupCount;
+        __u16 Reserved;
+        __le32 TotalParameterCount;
+        __le32 TotalDataCount;
+        __le32 MaxParameterCount;
+        __le32 MaxDataCount;
+        __le32 ParameterCount;
+        __le32 ParameterOffset;
+        __le32 DataCount;
+        __le32 DataOffset;
+        __u8 SetupCount; /* four setup words follow subcommand */
+        /* SNIA spec incorrectly included spurious pad here */
+        __le16 SubCommand; /* 2 = IOCTL/FSCTL */
+        /* SetupCount words follow then */
+        __le16 ByteCount;
+        __u8 Pad[3];
+        __u8 Parms[0];
 } __attribute__((packed)) NTRANSACT_REQ;
 
 typedef struct smb_com_ntransact_rsp {
@@ -1120,7 +1126,7 @@ typedef struct smb_com_ntransact_rsp {
         __le32 DataDisplacement;
         __u8 SetupCount;   /* 0 */
         __u16 ByteCount;
-        /* __u8 Pad[3]; */
+        /* __u8 Pad[3]; */
         /* parms and data follow */
 } __attribute__((packed)) NTRANSACT_RSP;
 
@@ -1215,7 +1221,7 @@ typedef struct smb_com_transaction_change_notify_req {
 /*      __u8 Data[1];*/
 } __attribute__((packed)) TRANSACT_CHANGE_NOTIFY_REQ;
 
-/* BB eventually change to use generic ntransact rsp struct 
+/* BB eventually change to use generic ntransact rsp struct
       and validation routine */
 typedef struct smb_com_transaction_change_notify_rsp {
         struct smb_hdr hdr;     /* wct = 18 */
@@ -1262,7 +1268,7 @@ struct file_notify_information {
         __le32 Action;
         __le32 FileNameLength;
         __u8  FileName[0];
-} __attribute__((packed)); 
+} __attribute__((packed));
 
 struct reparse_data {
         __u32   ReparseTag;
@@ -1331,7 +1337,7 @@ struct trans2_resp {
         __u8 Reserved1;
         /* SetupWords[SetupCount];
         __u16 ByteCount;
-        __u16 Reserved2;*/      
+        __u16 Reserved2;*/
         /* data area follows */
 } __attribute__((packed));
 
@@ -1370,9 +1376,9 @@ struct smb_t2_rsp {
 #define SMB_QUERY_FILE_INTERNAL_INFO    0x3ee
 #define SMB_QUERY_FILE_ACCESS_INFO      0x3f0
 #define SMB_QUERY_FILE_NAME_INFO2       0x3f1 /* 0x30 bytes */
-#define SMB_QUERY_FILE_POSITION_INFO    0x3f6 
+#define SMB_QUERY_FILE_POSITION_INFO    0x3f6
 #define SMB_QUERY_FILE_MODE_INFO        0x3f8
-#define SMB_QUERY_FILE_ALGN_INFO        0x3f9 
+#define SMB_QUERY_FILE_ALGN_INFO        0x3f9
 
 
 #define SMB_SET_FILE_BASIC_INFO         0x101
@@ -1506,35 +1512,35 @@ struct smb_com_transaction2_sfi_req {
         __u16 Pad1;
         __u16 Fid;
         __le16 InformationLevel;
-        __u16 Reserved4;        
+        __u16 Reserved4;
 } __attribute__((packed));
 
 struct smb_com_transaction2_sfi_rsp {
         struct smb_hdr hdr;     /* wct = 10 + SetupCount */
         struct trans2_resp t2;
         __u16 ByteCount;
-        __u16 Reserved2;        /* parameter word reserved - 
+        __u16 Reserved2;        /* parameter word reserved -
                                         present for infolevels > 100 */
 } __attribute__((packed));
 
 struct smb_t2_qfi_req {
-        struct  smb_hdr hdr;
-        struct  trans2_req t2;
+        struct  smb_hdr hdr;
+        struct  trans2_req t2;
         __u8    Pad;
         __u16   Fid;
         __le16  InformationLevel;
 } __attribute__((packed));
 
 struct smb_t2_qfi_rsp {
-        struct smb_hdr hdr;     /* wct = 10 + SetupCount */
-        struct trans2_resp t2;
-        __u16 ByteCount;
-        __u16 Reserved2;        /* parameter word reserved - 
-                                        present for infolevels > 100 */
+        struct smb_hdr hdr;     /* wct = 10 + SetupCount */
+        struct trans2_resp t2;
+        __u16 ByteCount;
+        __u16 Reserved2;        /* parameter word reserved -
+                                   present for infolevels > 100 */
 } __attribute__((packed));
 
 /*
- * Flags on T2 FINDFIRST and FINDNEXT 
+ * Flags on T2 FINDFIRST and FINDNEXT
  */
 #define CIFS_SEARCH_CLOSE_ALWAYS  0x0001
 #define CIFS_SEARCH_CLOSE_AT_END  0x0002
@@ -1743,7 +1749,9 @@ typedef struct smb_com_transaction2_get_dfs_refer_req {
         __u8 Reserved3;
         __le16 SubCommand;      /* one setup word */
         __le16 ByteCount;
-        __u8 Pad[3];            /* Win2K has sent 0x0F01 (max resp length perhaps?) followed by one byte pad - doesn't seem to matter though */
+        __u8 Pad[3];            /* Win2K has sent 0x0F01 (max response length
+                                   perhaps?) followed by one byte pad - doesn't
+                                   seem to matter though */
         __le16 MaxReferralLevel;
         char RequestFileName[1];
 } __attribute__((packed)) TRANSACTION2_GET_DFS_REFER_REQ;
@@ -1752,7 +1760,10 @@ typedef struct dfs_referral_level_3 {
         __le16 VersionNumber;
         __le16 ReferralSize;
         __le16 ServerType;      /* 0x0001 = CIFS server */
-        __le16 ReferralFlags;   /* or proximity - not clear which since always set to zero - SNIA spec says 0x01 means strip off PathConsumed chars before submitting RequestFileName to remote node */
+        __le16 ReferralFlags;   /* or proximity - not clear which since it is
+                                   always set to zero - SNIA spec says 0x01
+                                   means strip off PathConsumed chars before
+                                   submitting RequestFileName to remote node */
         __le16 TimeToLive;
         __le16 Proximity;
         __le16 DfsPathOffset;
@@ -1778,11 +1789,13 @@ typedef struct smb_com_transaction_get_dfs_refer_rsp {
 #define DFSREF_STORAGE_SERVER   0x0002
 
 /* IOCTL information */
-/* List of ioctl function codes that look to be of interest to remote clients like this. */
-/* Need to do some experimentation to make sure they all work remotely.                  */
-/* Some of the following such as the encryption/compression ones would be                */
-/* invoked from tools via a specialized hook into the VFS rather than via the            */
-/* standard vfs entry points */
+/*
+ * List of ioctl function codes that look to be of interest to remote clients
+ * like this one.  Need to do some experimentation to make sure they all work
+ * remotely.  Some of the following, such as the encryption/compression ones
+ * would be invoked from tools via a specialized hook into the VFS rather
+ * than via the standard vfs entry points
+ */
 #define FSCTL_REQUEST_OPLOCK_LEVEL_1 0x00090000
 #define FSCTL_REQUEST_OPLOCK_LEVEL_2 0x00090004
 #define FSCTL_REQUEST_BATCH_OPLOCK   0x00090008
@@ -1811,7 +1824,7 @@ typedef struct smb_com_transaction_get_dfs_refer_rsp {
 /*
  ************************************************************************
  * All structs for everything above the SMB PDUs themselves
- * (such as the T2 level specific data) go here                  
+ * (such as the T2 level specific data) go here
  ************************************************************************
  */
 
@@ -1857,7 +1870,7 @@ typedef struct {
         __le64 FreeAllocationUnits;
         __le32 SectorsPerAllocationUnit;
         __le32 BytesPerSector;
-} __attribute__((packed)) FILE_SYSTEM_INFO;             /* size info, level 0x103 */
+} __attribute__((packed)) FILE_SYSTEM_INFO;     /* size info, level 0x103 */
 
 typedef struct {
         __le32 fsid;
@@ -1871,7 +1884,7 @@ typedef struct {
         __le16 MajorVersionNumber;
         __le16 MinorVersionNumber;
         __le64 Capability;
-} __attribute__((packed)) FILE_SYSTEM_UNIX_INFO;        /* Unix extensions info, level 0x200 */
+} __attribute__((packed)) FILE_SYSTEM_UNIX_INFO; /* Unix extension level 0x200*/
 
 /* Version numbers for CIFS UNIX major and minor. */
 #define CIFS_UNIX_MAJOR_VERSION 1
@@ -1885,16 +1898,20 @@ typedef struct {
 #define CIFS_UNIX_POSIX_PATHNAMES_CAP   0x00000010 /* Allow POSIX path chars  */
 #define CIFS_UNIX_POSIX_PATH_OPS_CAP    0x00000020 /* Allow new POSIX path based
                                                       calls including posix open
-                                                      and posix unlink */ 
+                                                      and posix unlink */
+#define CIFS_UNIX_LARGE_READ_CAP        0x00000040 /* support reads >128K (up
+                                                      to 0xFFFF00 */
+#define CIFS_UNIX_LARGE_WRITE_CAP       0x00000080
+
 #ifdef CONFIG_CIFS_POSIX
 /* Can not set pathnames cap yet until we send new posix create SMB since
    otherwise server can treat such handles opened with older ntcreatex
    (by a new client which knows how to send posix path ops)
    as non-posix handles (can affect write behavior with byte range locks.
    We can add back in POSIX_PATH_OPS cap when Posix Create/Mkdir finished */
-/* #define CIFS_UNIX_CAP_MASK              0x0000003b */
-#define CIFS_UNIX_CAP_MASK              0x0000001b 
-#else 
+/* #define CIFS_UNIX_CAP_MASK              0x000000fb */
+#define CIFS_UNIX_CAP_MASK              0x000000db
+#else
 #define CIFS_UNIX_CAP_MASK              0x00000013
 #endif /* CONFIG_CIFS_POSIX */
 
@@ -1904,10 +1921,10 @@ typedef struct {
 typedef struct {
         /* For undefined recommended transfer size return -1 in that field */
         __le32 OptimalTransferSize;  /* bsize on some os, iosize on other os */
-        __le32 BlockSize; 
+        __le32 BlockSize;
     /* The next three fields are in terms of the block size.
         (above). If block size is unknown, 4096 would be a
-        reasonable block size for a server to report. 
+        reasonable block size for a server to report.
         Note that returning the blocks/blocksavail removes need
         to make a second call (to QFSInfo level 0x103 to get this info.
         UserBlockAvail is typically less than or equal to BlocksAvail,
@@ -2062,9 +2079,9 @@ struct file_alt_name_info {
 
 struct file_stream_info {
         __le32 number_of_streams;  /* BB check sizes and verify location */
-        /* followed by info on streams themselves 
+        /* followed by info on streams themselves
                 u64 size;
-                u64 allocation_size 
+                u64 allocation_size
                 stream info */
 };      /* level 0x109 */
 
@@ -2083,7 +2100,7 @@ struct cifs_posix_ace { /* access control entry (ACE) */
         __u8  cifs_e_tag;
         __u8  cifs_e_perm;
         __le64 cifs_uid; /* or gid */
-} __attribute__((packed)); 
+} __attribute__((packed));
 
 struct cifs_posix_acl { /* access conrol list  (ACL) */
         __le16  version;
@@ -2138,6 +2155,12 @@ typedef struct {
         /* struct following varies based on requested level */
 } __attribute__((packed)) OPEN_PSX_RSP; /* level 0x209 SetPathInfo data */
 
+#define SMB_POSIX_UNLINK_FILE_TARGET            0
+#define SMB_POSIX_UNLINK_DIRECTORY_TARGET       1
+
+struct unlink_psx_rq { /* level 0x20a SetPathInfo */
+        __le16 type;
+} __attribute__((packed));
 
 struct file_internal_info {
         __u64  UniqueId; /* inode number */
@@ -2154,7 +2177,7 @@ struct file_attrib_tag {
 
 
 /********************************************************/
-/*  FindFirst/FindNext transact2 data buffer formats    */ 
+/*  FindFirst/FindNext transact2 data buffer formats    */
 /********************************************************/
 
 typedef struct {
@@ -2232,7 +2255,7 @@ typedef struct {
         __le64 EndOfFile;
         __le64 AllocationSize;
         __le32 ExtFileAttributes;
-        __le32 FileNameLength; 
+        __le32 FileNameLength;
         __le32 EaSize; /* length of the xattrs */
         __u8   ShortNameLength;
         __u8   Reserved;
@@ -2259,7 +2282,7 @@ typedef struct {
 struct win_dev {
         unsigned char type[8]; /* IntxCHR or IntxBLK */
         __le64 major;
-        __le64 minor;   
+        __le64 minor;
 } __attribute__((packed));
 
 struct gea {
@@ -2291,36 +2314,36 @@ struct fealist {
 struct data_blob {
         __u8 *data;
         size_t length;
-        void (*free) (struct data_blob * data_blob);
+        void (*free) (struct data_blob *data_blob);
 } __attribute__((packed));
 
 
 #ifdef CONFIG_CIFS_POSIX
-/* 
+/*
         For better POSIX semantics from Linux client, (even better
         than the existing CIFS Unix Extensions) we need updated PDUs for:
-        
+
         1) PosixCreateX - to set and return the mode, inode#, device info and
         perhaps add a CreateDevice - to create Pipes and other special .inodes
         Also note POSIX open flags
-        2) Close - to return the last write time to do cache across close 
+        2) Close - to return the last write time to do cache across close
                 more safely
-        3) FindFirst return unique inode number - what about resume key, two 
+        3) FindFirst return unique inode number - what about resume key, two
         forms short (matches readdir) and full (enough info to cache inodes)
         4) Mkdir - set mode
-        
-        And under consideration: 
+
+        And under consideration:
         5) FindClose2 (return nanosecond timestamp ??)
-        6) Use nanosecond timestamps throughout all time fields if 
+        6) Use nanosecond timestamps throughout all time fields if
            corresponding attribute flag is set
         7) sendfile - handle based copy
         8) Direct i/o
         9) Misc fcntls?
-        
+
         what about fixing 64 bit alignment
-        
+
         There are also various legacy SMB/CIFS requests used as is
-        
+
         From existing Lanman and NTLM dialects:
         --------------------------------------
         NEGOTIATE
@@ -2341,48 +2364,48 @@ struct data_blob {
                 (BB verify that never need to set allocation size)
                 SMB_SET_FILE_BASIC_INFO2 (setting times - BB can it be done via
                          Unix ext?)
-        
+
         COPY (note support for copy across directories) - FUTURE, OPTIONAL
         setting/getting OS/2 EAs - FUTURE (BB can this handle
         setting Linux xattrs perfectly)         - OPTIONAL
         dnotify                                 - FUTURE, OPTIONAL
         quota                                   - FUTURE, OPTIONAL
-                        
-        Note that various requests implemented for NT interop such as 
+
+        Note that various requests implemented for NT interop such as
                 NT_TRANSACT (IOCTL) QueryReparseInfo
         are unneeded to servers compliant with the CIFS POSIX extensions
-        
+
         From CIFS Unix Extensions:
         -------------------------
         T2 SET_PATH_INFO (SMB_SET_FILE_UNIX_LINK) for symlinks
         T2 SET_PATH_INFO (SMB_SET_FILE_BASIC_INFO2)
         T2 QUERY_PATH_INFO (SMB_QUERY_FILE_UNIX_LINK)
-        T2 QUERY_PATH_INFO (SMB_QUERY_FILE_UNIX_BASIC) - BB check for missing inode fields
-                                        Actually need QUERY_FILE_UNIX_INFO since has inode num
-                                        BB what about a) blksize/blkbits/blocks
+        T2 QUERY_PATH_INFO (SMB_QUERY_FILE_UNIX_BASIC)  BB check for missing
+                                                        inode fields
+                                Actually a need QUERY_FILE_UNIX_INFO
+                                since has inode num
+                                BB what about a) blksize/blkbits/blocks
                                                           b) i_version
                                                           c) i_rdev
                                                           d) notify mask?
                                                           e) generation
                                                           f) size_seqcount
         T2 FIND_FIRST/FIND_NEXT FIND_FILE_UNIX
-        TRANS2_GET_DFS_REFERRAL                   - OPTIONAL but recommended
+        TRANS2_GET_DFS_REFERRAL               - OPTIONAL but recommended
         T2_QFS_INFO QueryDevice/AttributeInfo - OPTIONAL
-        
-        
  */
 
 /* xsymlink is a symlink format (used by MacOS) that can be used
-   to save symlink info in a regular file when 
+   to save symlink info in a regular file when
    mounted to operating systems that do not
    support the cifs Unix extensions or EAs (for xattr
    based symlinks).  For such a file to be recognized
-   as containing symlink data: 
+   as containing symlink data:
 
-   1) file size must be 1067, 
+   1) file size must be 1067,
    2) signature must begin file data,
    3) length field must be set to ASCII representation
-        of a number which is less than or equal to 1024, 
+        of a number which is less than or equal to 1024,
    4) md5 must match that of the path data */
 
 struct xsymlink {
@@ -2393,10 +2416,10 @@ struct xsymlink {
         char length[4];
         char cr1;         /* \n */
 /* md5 of valid subset of path ie path[0] through path[length-1] */
-        __u8 md5[32];    
+        __u8 md5[32];
         char cr2;        /* \n */
 /* if room left, then end with \n then 0x20s by convention but not required */
-        char path[1024];  
+        char path[1024];
 } __attribute__((packed));
 
 typedef struct file_xattr_info {
@@ -2405,7 +2428,8 @@ typedef struct file_xattr_info {
         __u32 xattr_value_len;
         char  xattr_name[0];
         /* followed by xattr_value[xattr_value_len], no pad */
-} __attribute__((packed)) FILE_XATTR_INFO; /* extended attribute, info level 0x205 */
+} __attribute__((packed)) FILE_XATTR_INFO; /* extended attribute info
+                                              level 0x205 */
 
 
 /* flags for chattr command */
@@ -2431,8 +2455,9 @@ typedef struct file_xattr_info {
 typedef struct file_chattr_info {
         __le64  mask; /* list of all possible attribute bits */
         __le64  mode; /* list of actual attribute bits on this inode */
-} __attribute__((packed)) FILE_CHATTR_INFO;  /* ext attributes (chattr, chflags) level 0x206 */
+} __attribute__((packed)) FILE_CHATTR_INFO;  /* ext attributes
+                                                (chattr, chflags) level 0x206 */
 
-#endif 
+#endif
 
 #endif                          /* _CIFSPDU_H */