Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / cifs / netmisc.c

diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index c8d1a56..5de74d2 100644 (file)
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -43,7 +43,7 @@ struct smb_to_posix_error {
        int posix_code;
 };
 
-const struct smb_to_posix_error mapping_table_ERRDOS[] = {
+static const struct smb_to_posix_error mapping_table_ERRDOS[] = {
        {ERRbadfunc, -EINVAL},
        {ERRbadfile, -ENOENT},
        {ERRbadpath, -ENOTDIR},
@@ -69,17 +69,20 @@ const struct smb_to_posix_error mapping_table_ERRDOS[] = {
        {ERRinvparm, -EINVAL},
        {ERRdiskfull, -ENOSPC},
        {ERRinvname, -ENOENT},
+       {ERRinvlevel,-EOPNOTSUPP},
        {ERRdirnotempty, -ENOTEMPTY},
        {ERRnotlocked, -ENOLCK},
        {ERRalreadyexists, -EEXIST},
        {ERRmoredata, -EOVERFLOW},
+       {ERReasnotsupported,-EOPNOTSUPP},
        {ErrQuota, -EDQUOT},
        {ErrNotALink, -ENOLINK},
        {ERRnetlogonNotStarted,-ENOPROTOOPT},
+       {ErrTooManyLinks,-EMLINK},
        {0, 0}
 };
 
-const struct smb_to_posix_error mapping_table_ERRSRV[] = {
+static const struct smb_to_posix_error mapping_table_ERRSRV[] = {
        {ERRerror, -EIO},
        {ERRbadpw, -EPERM},
        {ERRbadtype, -EREMOTE},
@@ -118,7 +121,7 @@ const struct smb_to_posix_error mapping_table_ERRSRV[] = {
        {0, 0}
 };
 
-const struct smb_to_posix_error mapping_table_ERRHRD[] = {
+static const struct smb_to_posix_error mapping_table_ERRHRD[] = {
        {0, 0}
 };
 
@@ -130,7 +133,6 @@ const struct smb_to_posix_error mapping_table_ERRHRD[] = {
 int
 cifs_inet_pton(int address_family, char *cp,void *dst)
 {
-       struct in_addr address;
        int value;
        int digit;
        int i;
@@ -187,8 +189,7 @@ cifs_inet_pton(int address_family, char *cp,void *dst)
        if (value > addr_class_max[end - bytes])
                return 0;
 
-       address.s_addr = *((int *) bytes) | htonl(value);
-       *((int *)dst) = address.s_addr;
+       *((__be32 *)dst) = *((__be32 *) bytes) | htonl(value);
        return 1; /* success */
 }
 
@@ -204,7 +205,7 @@ static const struct {
        {
        ERRDOS, ERRgeneral, NT_STATUS_UNSUCCESSFUL}, {
        ERRDOS, ERRbadfunc, NT_STATUS_NOT_IMPLEMENTED}, {
-       ERRDOS, 87, NT_STATUS_INVALID_INFO_CLASS}, {
+       ERRDOS, ERRinvlevel, NT_STATUS_INVALID_INFO_CLASS}, {
        ERRDOS, 24, NT_STATUS_INFO_LENGTH_MISMATCH}, {
        ERRHRD, ERRgeneral, NT_STATUS_ACCESS_VIOLATION}, {
        ERRHRD, ERRgeneral, NT_STATUS_IN_PAGE_ERROR}, {
@@ -287,7 +288,7 @@ static const struct {
        ERRDOS, 87, NT_STATUS_BAD_WORKING_SET_LIMIT}, {
        ERRDOS, 87, NT_STATUS_INCOMPATIBLE_FILE_MAP}, {
        ERRDOS, 87, NT_STATUS_SECTION_PROTECTION}, {
-       ERRDOS, 282, NT_STATUS_EAS_NOT_SUPPORTED}, {
+       ERRDOS, ERReasnotsupported, NT_STATUS_EAS_NOT_SUPPORTED}, {
        ERRDOS, 255, NT_STATUS_EA_TOO_LARGE}, {
        ERRHRD, ERRgeneral, NT_STATUS_NONEXISTENT_EA_ENTRY}, {
        ERRHRD, ERRgeneral, NT_STATUS_NO_EAS_ON_FILE}, {
@@ -329,7 +330,7 @@ static const struct {
        ERRHRD, ERRgeneral, NT_STATUS_ACCOUNT_RESTRICTION}, {
        ERRSRV, 2241, NT_STATUS_INVALID_LOGON_HOURS}, {
        ERRSRV, 2240, NT_STATUS_INVALID_WORKSTATION}, {
-       ERRSRV, 2242, NT_STATUS_PASSWORD_EXPIRED}, {
+       ERRSRV, ERRpasswordExpired, NT_STATUS_PASSWORD_EXPIRED}, {
        ERRSRV, 2239, NT_STATUS_ACCOUNT_DISABLED}, {
        ERRHRD, ERRgeneral, NT_STATUS_NONE_MAPPED}, {
        ERRHRD, ERRgeneral, NT_STATUS_TOO_MANY_LUIDS_REQUESTED}, {
@@ -675,7 +676,7 @@ static const struct {
        ERRDOS, 193, NT_STATUS_IMAGE_CHECKSUM_MISMATCH}, {
        ERRHRD, ERRgeneral, NT_STATUS_LOST_WRITEBEHIND_DATA}, {
        ERRHRD, ERRgeneral, NT_STATUS_CLIENT_SERVER_PARAMETERS_INVALID}, {
-       ERRSRV, 2242, NT_STATUS_PASSWORD_MUST_CHANGE}, {
+       ERRSRV, ERRpasswordExpired, NT_STATUS_PASSWORD_MUST_CHANGE}, {
        ERRHRD, ERRgeneral, NT_STATUS_NOT_FOUND}, {
        ERRHRD, ERRgeneral, NT_STATUS_NOT_TINY_STREAM}, {
        ERRHRD, ERRgeneral, NT_STATUS_RECOVERY_FAILURE}, {
@@ -740,7 +741,7 @@ static const struct {
        ERRDOS, 182, NT_STATUS_DRIVER_ORDINAL_NOT_FOUND}, {
        ERRDOS, 127, NT_STATUS_DRIVER_ENTRYPOINT_NOT_FOUND}, {
        ERRDOS, 288, NT_STATUS_RESOURCE_NOT_OWNED}, {
-       ERRHRD, ERRgeneral, NT_STATUS_TOO_MANY_LINKS}, {
+       ERRDOS, ErrTooManyLinks, NT_STATUS_TOO_MANY_LINKS}, {
        ERRHRD, ERRgeneral, NT_STATUS_QUOTA_LIST_INCONSISTENT}, {
        ERRHRD, ERRgeneral, NT_STATUS_FILE_IS_OFFLINE}, {
        ERRDOS, 21, 0xc000026e}, {
@@ -752,7 +753,8 @@ static const struct {
        ERRDOS, ERRnoaccess, 0xc000028e}, {
        ERRDOS, ERRnoaccess, 0xc000028f}, {
        ERRDOS, ERRnoaccess, 0xc0000290}, {
-ERRDOS, ERRbadfunc, 0xc000029c},};
+       ERRDOS, ERRbadfunc, 0xc000029c}, {
+       ERRDOS, ERRinvlevel, 0x007c0001}, };
 
 /*****************************************************************************
  Print an error message from the status code
@@ -810,16 +812,13 @@ map_smb_to_linux_error(struct smb_hdr *smb)
 
        if (smb->Flags2 & SMBFLG2_ERR_STATUS) {
                /* translate the newer STATUS codes to old style errors and then to POSIX errors */
-               smb->Status.CifsError = le32_to_cpu(smb->Status.CifsError);
-               if(cifsFYI)
-                       cifs_print_status(smb->Status.CifsError);
-               ntstatus_to_dos(smb->Status.CifsError, &smberrclass,
-                               &smberrcode);
+               __u32 err = le32_to_cpu(smb->Status.CifsError);
+               if(cifsFYI & CIFS_RC)
+                       cifs_print_status(err);
+               ntstatus_to_dos(err, &smberrclass, &smberrcode);
        } else {
                smberrclass = smb->Status.DosError.ErrorClass;
-               smb->Status.DosError.Error =
-                   le16_to_cpu(smb->Status.DosError.Error);
-               smberrcode = smb->Status.DosError.Error;
+               smberrcode = le16_to_cpu(smb->Status.DosError.Error);
        }
 
        /* old style errors */
@@ -869,7 +868,14 @@ unsigned int
 smbCalcSize(struct smb_hdr *ptr)
 {
        return (sizeof (struct smb_hdr) + (2 * ptr->WordCount) +
-               BCC(ptr));
+               2 /* size of the bcc field */ + BCC(ptr));
+}
+
+unsigned int
+smbCalcSize_LE(struct smb_hdr *ptr)
+{
+       return (sizeof (struct smb_hdr) + (2 * ptr->WordCount) +
+               2 /* size of the bcc field */ + le16_to_cpu(BCC_LE(ptr)));
 }
 
 /* The following are taken from fs/ntfs/util.c */