[SCSI] qla4xxx: Assign values using correct datatype

[pandora-kernel.git] / ipc / msgutil.c

diff --git a/ipc/msgutil.c b/ipc/msgutil.c
index 0a5c8a9..d43439e 100644 (file)
--- a/ipc/msgutil.c
+++ b/ipc/msgutil.c
@@ -17,7 +17,7 @@
 #include <linux/ipc_namespace.h>
 #include <linux/utsname.h>
 #include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include "util.h"
 
@@ -37,7 +37,7 @@ struct ipc_namespace init_ipc_ns = {
 atomic_t nr_ipc_ns = ATOMIC_INIT(1);
 
 struct msg_msgseg {
-       struct msg_msgseg* next;
+       struct msg_msgseg *next;
        /* the next part of the message follows immediately */
 };
 
@@ -84,7 +84,7 @@ struct msg_msg *load_msg(const void __user *src, int len)
 {
        struct msg_msg *msg;
        struct msg_msgseg *seg;
-       int err;
+       int err = -EFAULT;
        int alen;
 
        msg = alloc_msg(len);
@@ -92,23 +92,15 @@ struct msg_msg *load_msg(const void __user *src, int len)
                return ERR_PTR(-ENOMEM);
 
        alen = min(len, DATALEN_MSG);
-       if (copy_from_user(msg + 1, src, alen)) {
-               err = -EFAULT;
+       if (copy_from_user(msg + 1, src, alen))
                goto out_err;
-       }
 
-       len -= alen;
-       src = ((char __user *)src) + alen;
-       seg = msg->next;
-       while (len > 0) {
+       for (seg = msg->next; seg != NULL; seg = seg->next) {
+               len -= alen;
+               src = (char __user *)src + alen;
                alen = min(len, DATALEN_SEG);
-               if (copy_from_user(seg + 1, src, alen)) {
-                       err = -EFAULT;
+               if (copy_from_user(seg + 1, src, alen))
                        goto out_err;
-               }
-               seg = seg->next;
-               len -= alen;
-               src = ((char __user *)src) + alen;
        }
 
        err = security_msg_msg_alloc(msg);
@@ -135,15 +127,13 @@ struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst)
        alen = min(len, DATALEN_MSG);
        memcpy(dst + 1, src + 1, alen);
 
-       len -= alen;
-       dst_pseg = dst->next;
-       src_pseg = src->next;
-       while (len > 0) {
+       for (dst_pseg = dst->next, src_pseg = src->next;
+            src_pseg != NULL;
+            dst_pseg = dst_pseg->next, src_pseg = src_pseg->next) {
+
+               len -= alen;
                alen = min(len, DATALEN_SEG);
                memcpy(dst_pseg + 1, src_pseg + 1, alen);
-               dst_pseg = dst_pseg->next;
-               len -= alen;
-               src_pseg = src_pseg->next;
        }
 
        dst->m_type = src->m_type;
@@ -166,16 +156,12 @@ int store_msg(void __user *dest, struct msg_msg *msg, int len)
        if (copy_to_user(dest, msg + 1, alen))
                return -1;
 
-       len -= alen;
-       dest = ((char __user *)dest) + alen;
-       seg = msg->next;
-       while (len > 0) {
+       for (seg = msg->next; seg != NULL; seg = seg->next) {
+               len -= alen;
+               dest = (char __user *)dest + alen;
                alen = min(len, DATALEN_SEG);
                if (copy_to_user(dest, seg + 1, alen))
                        return -1;
-               len -= alen;
-               dest = ((char __user *)dest) + alen;
-               seg = seg->next;
        }
        return 0;
 }