aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifssmb.c
diff options
context:
space:
mode:
authorSteve French <smfrench@austin.rr.com>2005-04-29 01:41:04 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-29 01:41:04 -0400
commitc67593a03129967eae8939c4899767182eb6d6cd (patch)
tree76fdc06010b9b73965893a5bf7bfc30ec2adf2e4 /fs/cifs/cifssmb.c
parent75cf6bdc52d86ca815f1129529e43f0d904b18d5 (diff)
[PATCH] cifs: Enable ioctl support in POSIX extensions to handle lsattr
remove sparse warnings, unnecessary pad in QueryFileInfo and redundant function define. Signed-off-by: Steve French (sfrench@us.ibm.com) Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/cifs/cifssmb.c')
-rw-r--r--fs/cifs/cifssmb.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 36d3c128a58b..237e3bf94bfe 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -2093,9 +2093,9 @@ GetExtAttrRetry:
2093 if (rc) 2093 if (rc)
2094 return rc; 2094 return rc;
2095 2095
2096 params = 2 /* level */ +2 /* fid */ + 2 /* rsrvd */; 2096 params = 2 /* level */ +2 /* fid */;
2097 pSMB->t2.TotalDataCount = 0; 2097 pSMB->t2.TotalDataCount = 0;
2098 pSMB->t2.MaxParameterCount = cpu_to_le16(2); 2098 pSMB->t2.MaxParameterCount = cpu_to_le16(4);
2099 /* BB find exact max data count below from sess structure BB */ 2099 /* BB find exact max data count below from sess structure BB */
2100 pSMB->t2.MaxDataCount = cpu_to_le16(4000); 2100 pSMB->t2.MaxDataCount = cpu_to_le16(4000);
2101 pSMB->t2.MaxSetupCount = 0; 2101 pSMB->t2.MaxSetupCount = 0;
@@ -2103,19 +2103,18 @@ GetExtAttrRetry:
2103 pSMB->t2.Flags = 0; 2103 pSMB->t2.Flags = 0;
2104 pSMB->t2.Timeout = 0; 2104 pSMB->t2.Timeout = 0;
2105 pSMB->t2.Reserved2 = 0; 2105 pSMB->t2.Reserved2 = 0;
2106 pSMB->t2.ParameterOffset = cpu_to_le16(offsetof( 2106 pSMB->t2.ParameterOffset = cpu_to_le16(offsetof(struct smb_t2_qfi_req,
2107 struct smb_com_transaction2_qpi_req ,InformationLevel) - 4); 2107 Fid) - 4);
2108 pSMB->t2.DataCount = 0; 2108 pSMB->t2.DataCount = 0;
2109 pSMB->t2.DataOffset = 0; 2109 pSMB->t2.DataOffset = 0;
2110 pSMB->t2.SetupCount = 1; 2110 pSMB->t2.SetupCount = 1;
2111 pSMB->t2.Reserved3 = 0; 2111 pSMB->t2.Reserved3 = 0;
2112 pSMB->t2.SubCommand = cpu_to_le16(TRANS2_QUERY_FILE_INFORMATION); 2112 pSMB->t2.SubCommand = cpu_to_le16(TRANS2_QUERY_FILE_INFORMATION);
2113 byte_count = params + 3 /* pad */ ; 2113 byte_count = params + 1 /* pad */ ;
2114 pSMB->t2.TotalParameterCount = cpu_to_le16(params); 2114 pSMB->t2.TotalParameterCount = cpu_to_le16(params);
2115 pSMB->t2.ParameterCount = pSMB->t2.TotalParameterCount; 2115 pSMB->t2.ParameterCount = pSMB->t2.TotalParameterCount;
2116 pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_ATTR_FLAGS); 2116 pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_ATTR_FLAGS);
2117 pSMB->Pad1 = 0; 2117 pSMB->Pad = 0;
2118 pSMB->Pad2 = 0;
2119 pSMB->Fid = netfid; 2118 pSMB->Fid = netfid;
2120 pSMB->hdr.smb_buf_length += byte_count; 2119 pSMB->hdr.smb_buf_length += byte_count;
2121 pSMB->t2.ByteCount = cpu_to_le16(byte_count); 2120 pSMB->t2.ByteCount = cpu_to_le16(byte_count);