Merge branch 'akpm' (patches from Andrew)

[linux-2.6-block.git] / drivers / tty / n_tty.c

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index e49c2bce551d31db115b97f0a12807339258b69b..d9a5fc28fef4bbfe56850e258b726ca3464fd82b 100644 (file)
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -162,12 +162,23 @@ static inline int tty_put_user(struct tty_struct *tty, unsigned char x,
        return put_user(x, ptr);
 }
 
-static inline int tty_copy_to_user(struct tty_struct *tty,
-                                       void __user *to,
-                                       const void *from,
-                                       unsigned long n)
+static int tty_copy_to_user(struct tty_struct *tty, void __user *to,
+                           size_t tail, size_t n)
 {
        struct n_tty_data *ldata = tty->disc_data;
+       size_t size = N_TTY_BUF_SIZE - tail;
+       const void *from = read_buf_addr(ldata, tail);
+       int uncopied;
+
+       if (n > size) {
+               tty_audit_add_data(tty, from, size, ldata->icanon);
+               uncopied = copy_to_user(to, from, size);
+               if (uncopied)
+                       return uncopied;
+               to += size;
+               n -= size;
+               from = ldata->read_buf;
+       }
 
        tty_audit_add_data(tty, from, n, ldata->icanon);
        return copy_to_user(to, from, n);
@@ -1201,9 +1212,7 @@ static void n_tty_receive_overrun(struct tty_struct *tty)
        ldata->num_overrun++;
        if (time_after(jiffies, ldata->overrun_time + HZ) ||
                        time_after(ldata->overrun_time, jiffies)) {
-               printk(KERN_WARNING "%s: %d input overrun(s)\n",
-                       tty_name(tty),
-                       ldata->num_overrun);
+               tty_warn(tty, "%d input overrun(s)\n", ldata->num_overrun);
                ldata->overrun_time = jiffies;
                ldata->num_overrun = 0;
        }
@@ -1486,8 +1495,7 @@ n_tty_receive_char_flagged(struct tty_struct *tty, unsigned char c, char flag)
                n_tty_receive_overrun(tty);
                break;
        default:
-               printk(KERN_ERR "%s: unknown flag %d\n",
-                      tty_name(tty), flag);
+               tty_err(tty, "unknown flag %d\n", flag);
                break;
        }
 }
@@ -2006,11 +2014,11 @@ static int copy_from_read_buf(struct tty_struct *tty,
        n = min(head - ldata->read_tail, N_TTY_BUF_SIZE - tail);
        n = min(*nr, n);
        if (n) {
-               retval = copy_to_user(*b, read_buf_addr(ldata, tail), n);
+               const unsigned char *from = read_buf_addr(ldata, tail);
+               retval = copy_to_user(*b, from, n);
                n -= retval;
-               is_eof = n == 1 && read_buf(ldata, tail) == EOF_CHAR(tty);
-               tty_audit_add_data(tty, read_buf_addr(ldata, tail), n,
-                               ldata->icanon);
+               is_eof = n == 1 && *from == EOF_CHAR(tty);
+               tty_audit_add_data(tty, from, n, ldata->icanon);
                smp_store_release(&ldata->read_tail, ldata->read_tail + n);
                /* Turn single EOF into zero-length read */
                if (L_EXTPROC(tty) && ldata->icanon && is_eof &&
@@ -2072,12 +2080,10 @@ static int canon_copy_from_read_buf(struct tty_struct *tty,
        if (eol == N_TTY_BUF_SIZE && more) {
                /* scan wrapped without finding set bit */
                eol = find_next_bit(ldata->read_flags, more, 0);
-               if (eol != more)
-                       found = 1;
-       } else if (eol != size)
-               found = 1;
+               found = eol != more;
+       } else
+               found = eol != size;
 
-       size = N_TTY_BUF_SIZE - tail;
        n = eol - tail;
        if (n > N_TTY_BUF_SIZE)
                n += N_TTY_BUF_SIZE;
@@ -2088,17 +2094,10 @@ static int canon_copy_from_read_buf(struct tty_struct *tty,
                n = c;
        }
 
-       n_tty_trace("%s: eol:%zu found:%d n:%zu c:%zu size:%zu more:%zu\n",
-                   __func__, eol, found, n, c, size, more);
-
-       if (n > size) {
-               ret = tty_copy_to_user(tty, *b, read_buf_addr(ldata, tail), size);
-               if (ret)
-                       return -EFAULT;
-               ret = tty_copy_to_user(tty, *b + size, ldata->read_buf, n - size);
-       } else
-               ret = tty_copy_to_user(tty, *b, read_buf_addr(ldata, tail), n);
+       n_tty_trace("%s: eol:%zu found:%d n:%zu c:%zu tail:%zu more:%zu\n",
+                   __func__, eol, found, n, c, tail, more);
 
+       ret = tty_copy_to_user(tty, *b, tail, n);
        if (ret)
                return -EFAULT;
        *b += n;