vserver 1.9.3

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

diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index c8d1a56..a78ed0a 100644 (file)
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -187,8 +187,8 @@ 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;
+       address.s_addr = *((__be32 *) bytes) | htonl(value);
+       *((__be32 *)dst) = address.s_addr;
        return 1; /* success */
 }
 
@@ -810,16 +810,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);
+               __u32 err = le32_to_cpu(smb->Status.CifsError);
                if(cifsFYI)
-                       cifs_print_status(smb->Status.CifsError);
-               ntstatus_to_dos(smb->Status.CifsError, &smberrclass,
-                               &smberrcode);
+                       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 */