| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1258372985.31356.14.camel@wall-e>
Date: Mon, 16 Nov 2009 13:03:05 +0100
From: Stefani Seibold <stefani@...bold.net>
To: linux-kernel <linux-kernel@...r.kernel.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Arnd Bergmann <arnd@...db.de>,
Andi Kleen <andi@...stfloor.org>,
Amerigo Wang <xiyou.wangcong@...il.com>,
Joe Perches <joe@...ches.com>
Subject: Re: [PATCH 4/7] kfifo: rename kfifo_put... into kfifo_in... and
kfifo_get... into kfifo_out...
rename kfifo_put... into kfifo_in... to prevent miss use of old non in
kernel-tree drivers
ditto for kfifo_get... -> kfifo_out...
Improve the prototypes of kfifo_in and kfifo_out to make the kerneldoc
annotations more readable.
Add mini "howto porting to the new API" in kfifo.h
Signed-off-by: Stefani Seibold <stefani@...bold.net>
Acked-by: Greg Kroah-Hartman <gregkh@...e.de>
Acked-by: Mauro Carvalho Chehab <mchehab@...hat.com>
Acked-by: Andi Kleen <ak@...ux.intel.com>
Acked-by: Arnd Bergmann <arnd@...db.de>
---
drivers/char/nozomi.c | 4 +-
drivers/char/sonypi.c | 8 ++---
drivers/infiniband/hw/cxgb3/cxio_resource.c | 16 +++++------
drivers/media/video/meye.c | 16 +++++------
drivers/net/wireless/libertas/main.c | 4 +-
drivers/platform/x86/fujitsu-laptop.c | 4 +-
drivers/platform/x86/sony-laptop.c | 8 ++---
drivers/scsi/libiscsi.c | 14 +++++-----
drivers/scsi/libiscsi_tcp.c | 18 ++++++------
drivers/scsi/libsrp.c | 6 ++--
drivers/usb/host/fhci.h | 4 +-
drivers/usb/serial/generic.c | 4 +-
include/linux/kfifo.h | 39 ++++++++++++++++++++--------
kernel/kfifo.c | 32 +++++++++++-----------
net/dccp/probe.c | 4 +-
15 files changed, 100 insertions(+), 81 deletions(-)
diff -u -N -r kfifo3/drivers/char/nozomi.c kfifo4/drivers/char/nozomi.c
--- kfifo3/drivers/char/nozomi.c 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/drivers/char/nozomi.c 2009-10-19 21:21:36.000000000 +0200
@@ -798,7 +798,7 @@
struct tty_struct *tty = tty_port_tty_get(&port->port);
/* Get data from tty and place in buf for now */
- size = kfifo_get(&port->fifo_ul, dc->send_buf,
+ size = kfifo_out(&port->fifo_ul, dc->send_buf,
ul_size < SEND_BUF_MAX ? ul_size : SEND_BUF_MAX);
if (size == 0) {
@@ -1672,7 +1672,7 @@
goto exit;
}
- rval = kfifo_put(&port->fifo_ul, (unsigned char *)buffer, count);
+ rval = kfifo_in(&port->fifo_ul, (unsigned char *)buffer, count);
/* notify card */
if (unlikely(dc == NULL)) {
diff -u -N -r kfifo3/drivers/char/sonypi.c kfifo4/drivers/char/sonypi.c
--- kfifo3/drivers/char/sonypi.c 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/drivers/char/sonypi.c 2009-10-19 21:21:36.000000000 +0200
@@ -777,7 +777,7 @@
{
struct sonypi_keypress kp;
- while (kfifo_get_locked(&sonypi_device.input_fifo, (unsigned char *)&kp,
+ while (kfifo_out_locked(&sonypi_device.input_fifo, (unsigned char *)&kp,
sizeof(kp), &sonypi_device.input_fifo_lock)
== sizeof(kp)) {
msleep(10);
@@ -828,7 +828,7 @@
if (kp.dev) {
input_report_key(kp.dev, kp.key, 1);
input_sync(kp.dev);
- kfifo_put_locked(&sonypi_device.input_fifo,
+ kfifo_in_locked(&sonypi_device.input_fifo,
(unsigned char *)&kp, sizeof(kp),
&sonypi_device.input_fifo_lock);
schedule_work(&sonypi_device.input_work);
@@ -882,7 +882,7 @@
acpi_bus_generate_proc_event(sonypi_acpi_device, 1, event);
#endif
- kfifo_put_locked(&sonypi_device.fifo, (unsigned char *)&event,
+ kfifo_in_locked(&sonypi_device.fifo, (unsigned char *)&event,
sizeof(event), &sonypi_device.fifo_lock);
kill_fasync(&sonypi_device.fifo_async, SIGIO, POLL_IN);
wake_up_interruptible(&sonypi_device.fifo_proc_list);
@@ -932,7 +932,7 @@
return ret;
while (ret < count &&
- (kfifo_get_locked(&sonypi_device.fifo, &c, sizeof(c),
+ (kfifo_out_locked(&sonypi_device.fifo, &c, sizeof(c),
&sonypi_device.fifo_lock) == sizeof(c))) {
if (put_user(c, buf++))
return -EFAULT;
diff -u -N -r kfifo3/drivers/infiniband/hw/cxgb3/cxio_resource.c kfifo4/drivers/infiniband/hw/cxgb3/cxio_resource.c
--- kfifo3/drivers/infiniband/hw/cxgb3/cxio_resource.c 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/drivers/infiniband/hw/cxgb3/cxio_resource.c 2009-10-19 21:21:36.000000000 +0200
@@ -59,7 +59,7 @@
return -ENOMEM;
for (i = 0; i < skip_low + skip_high; i++)
- kfifo_put(fifo, (unsigned char *) &entry, sizeof(u32));
+ kfifo_in(fifo, (unsigned char *) &entry, sizeof(u32));
if (random) {
j = 0;
random_bytes = random32();
@@ -71,22 +71,22 @@
random_bytes = random32();
}
idx = (random_bytes >> (j * 2)) & 0xF;
- kfifo_put(fifo,
+ kfifo_in(fifo,
(unsigned char *) &rarray[idx],
sizeof(u32));
rarray[idx] = i;
j++;
}
for (i = 0; i < RANDOM_SIZE; i++)
- kfifo_put(fifo,
+ kfifo_in(fifo,
(unsigned char *) &rarray[i],
sizeof(u32));
} else
for (i = skip_low; i < nr - skip_high; i++)
- kfifo_put(fifo, (unsigned char *) &i, sizeof(u32));
+ kfifo_in(fifo, (unsigned char *) &i, sizeof(u32));
for (i = 0; i < skip_low + skip_high; i++)
- kfifo_get_locked(fifo, (unsigned char *) &entry,
+ kfifo_out_locked(fifo, (unsigned char *) &entry,
sizeof(u32), fifo_lock);
return 0;
}
@@ -119,7 +119,7 @@
for (i = 16; i < T3_MAX_NUM_QP; i++)
if (!(i & rdev_p->qpmask))
- kfifo_put(&rdev_p->rscp->qpid_fifo,
+ kfifo_in(&rdev_p->rscp->qpid_fifo,
(unsigned char *) &i, sizeof(u32));
return 0;
}
@@ -180,7 +180,7 @@
static u32 cxio_hal_get_resource(struct kfifo *fifo, spinlock_t * lock)
{
u32 entry;
- if (kfifo_get_locked(fifo, (unsigned char *) &entry, sizeof(u32), lock))
+ if (kfifo_out_locked(fifo, (unsigned char *) &entry, sizeof(u32), lock))
return entry;
else
return 0; /* fifo emptry */
@@ -190,7 +190,7 @@
u32 entry)
{
BUG_ON(
- kfifo_put_locked(fifo, (unsigned char *) &entry, sizeof(u32), lock)
+ kfifo_in_locked(fifo, (unsigned char *) &entry, sizeof(u32), lock)
== 0);
}
diff -u -N -r kfifo3/drivers/media/video/meye.c kfifo4/drivers/media/video/meye.c
--- kfifo3/drivers/media/video/meye.c 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/drivers/media/video/meye.c 2009-10-19 21:21:36.000000000 +0200
@@ -800,7 +800,7 @@
return IRQ_HANDLED;
if (meye.mchip_mode == MCHIP_HIC_MODE_CONT_OUT) {
- if (kfifo_get_locked(&meye.grabq, (unsigned char *)&reqnr,
+ if (kfifo_out_locked(&meye.grabq, (unsigned char *)&reqnr,
sizeof(int), &meye.grabq_lock) != sizeof(int)) {
mchip_free_frame();
return IRQ_HANDLED;
@@ -811,7 +811,7 @@
meye.grab_buffer[reqnr].state = MEYE_BUF_DONE;
do_gettimeofday(&meye.grab_buffer[reqnr].timestamp);
meye.grab_buffer[reqnr].sequence = sequence++;
- kfifo_put_locked(&meye.doneq, (unsigned char *)&reqnr,
+ kfifo_in_locked(&meye.doneq, (unsigned char *)&reqnr,
sizeof(int), &meye.doneq_lock);
wake_up_interruptible(&meye.proc_list);
} else {
@@ -821,7 +821,7 @@
mchip_free_frame();
goto again;
}
- if (kfifo_get_locked(&meye.grabq, (unsigned char *)&reqnr,
+ if (kfifo_out_locked(&meye.grabq, (unsigned char *)&reqnr,
sizeof(int), &meye.grabq_lock) != sizeof(int)) {
mchip_free_frame();
goto again;
@@ -832,7 +832,7 @@
meye.grab_buffer[reqnr].state = MEYE_BUF_DONE;
do_gettimeofday(&meye.grab_buffer[reqnr].timestamp);
meye.grab_buffer[reqnr].sequence = sequence++;
- kfifo_put_locked(&meye.doneq, (unsigned char *)&reqnr,
+ kfifo_in_locked(&meye.doneq, (unsigned char *)&reqnr,
sizeof(int), &meye.doneq_lock);
wake_up_interruptible(&meye.proc_list);
}
@@ -935,7 +935,7 @@
mchip_cont_compression_start();
meye.grab_buffer[*nb].state = MEYE_BUF_USING;
- kfifo_put_locked(&meye.grabq, (unsigned char *)nb, sizeof(int),
+ kfifo_in_locked(&meye.grabq, (unsigned char *)nb, sizeof(int),
&meye.grabq_lock);
mutex_unlock(&meye.lock);
@@ -968,7 +968,7 @@
/* fall through */
case MEYE_BUF_DONE:
meye.grab_buffer[*i].state = MEYE_BUF_UNUSED;
- kfifo_get_locked(&meye.doneq, (unsigned char *)&unused,
+ kfifo_out_locked(&meye.doneq, (unsigned char *)&unused,
sizeof(int), &meye.doneq_lock);
}
*i = meye.grab_buffer[*i].size;
@@ -1456,7 +1456,7 @@
buf->flags |= V4L2_BUF_FLAG_QUEUED;
buf->flags &= ~V4L2_BUF_FLAG_DONE;
meye.grab_buffer[buf->index].state = MEYE_BUF_USING;
- kfifo_put_locked(&meye.grabq, (unsigned char *)&buf->index,
+ kfifo_in_locked(&meye.grabq, (unsigned char *)&buf->index,
sizeof(int), &meye.grabq_lock);
mutex_unlock(&meye.lock);
@@ -1483,7 +1483,7 @@
return -EINTR;
}
- if (!kfifo_get_locked(&meye.doneq, (unsigned char *)&reqnr,
+ if (!kfifo_out_locked(&meye.doneq, (unsigned char *)&reqnr,
sizeof(int), &meye.doneq_lock)) {
mutex_unlock(&meye.lock);
return -EBUSY;
diff -u -N -r kfifo3/drivers/net/wireless/libertas/main.c kfifo4/drivers/net/wireless/libertas/main.c
--- kfifo3/drivers/net/wireless/libertas/main.c 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/drivers/net/wireless/libertas/main.c 2009-10-19 21:21:36.000000000 +0200
@@ -854,7 +854,7 @@
while (kfifo_len(&priv->event_fifo)) {
u32 event;
- kfifo_get(&priv->event_fifo, (unsigned char *) &event,
+ kfifo_out(&priv->event_fifo, (unsigned char *) &event,
sizeof(event));
spin_unlock_irq(&priv->driver_lock);
lbs_process_event(priv, event);
@@ -1579,7 +1579,7 @@
if (priv->psstate == PS_STATE_SLEEP)
priv->psstate = PS_STATE_AWAKE;
- kfifo_put(&priv->event_fifo, (unsigned char *) &event, sizeof(u32));
+ kfifo_in(&priv->event_fifo, (unsigned char *) &event, sizeof(u32));
wake_up_interruptible(&priv->waitq);
diff -u -N -r kfifo3/drivers/platform/x86/fujitsu-laptop.c kfifo4/drivers/platform/x86/fujitsu-laptop.c
--- kfifo3/drivers/platform/x86/fujitsu-laptop.c 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/drivers/platform/x86/fujitsu-laptop.c 2009-10-19 21:21:36.000000000 +0200
@@ -1006,7 +1006,7 @@
vdbg_printk(FUJLAPTOP_DBG_TRACE,
"Push keycode into ringbuffer [%d]\n",
keycode);
- status = kfifo_put_locked(&fujitsu_hotkey->fifo,
+ status = kfifo_in_locked(&fujitsu_hotkey->fifo,
(unsigned char *)&keycode,
sizeof(keycode),
&fujitsu_hotkey->fifo_lock);
@@ -1020,7 +1020,7 @@
}
} else if (keycode == 0) {
while ((status =
- kfifo_get_locked(
+ kfifo_out_locked(
&fujitsu_hotkey->fifo,
(unsigned char *) &keycode_r,
sizeof(keycode_r),
diff -u -N -r kfifo3/drivers/platform/x86/sony-laptop.c kfifo4/drivers/platform/x86/sony-laptop.c
--- kfifo3/drivers/platform/x86/sony-laptop.c 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/drivers/platform/x86/sony-laptop.c 2009-10-19 21:21:36.000000000 +0200
@@ -300,7 +300,7 @@
{
struct sony_laptop_keypress kp;
- while (kfifo_get_locked(&sony_laptop_input.fifo, (unsigned char *)&kp,
+ while (kfifo_out_locked(&sony_laptop_input.fifo, (unsigned char *)&kp,
sizeof(kp), &sony_laptop_input.fifo_lock)
== sizeof(kp)) {
msleep(10);
@@ -363,7 +363,7 @@
/* we emit the scancode so we can always remap the key */
input_event(kp.dev, EV_MSC, MSC_SCAN, event);
input_sync(kp.dev);
- kfifo_put_locked(&sony_laptop_input.fifo,
+ kfifo_in_locked(&sony_laptop_input.fifo,
(unsigned char *)&kp, sizeof(kp),
&sony_laptop_input.fifo_lock);
@@ -2130,7 +2130,7 @@
return ret;
while (ret < count &&
- (kfifo_get_locked(&sonypi_compat.fifo, &c, sizeof(c),
+ (kfifo_out_locked(&sonypi_compat.fifo, &c, sizeof(c),
&sonypi_compat.fifo_lock) == sizeof(c))) {
if (put_user(c, buf++))
return -EFAULT;
@@ -2310,7 +2310,7 @@
static void sonypi_compat_report_event(u8 event)
{
- kfifo_put_locked(&sonypi_compat.fifo, (unsigned char *)&event,
+ kfifo_in_locked(&sonypi_compat.fifo, (unsigned char *)&event,
sizeof(event), &sonypi_compat.fifo_lock);
kill_fasync(&sonypi_compat.fifo_async, SIGIO, POLL_IN);
wake_up_interruptible(&sonypi_compat.fifo_proc_list);
diff -u -N -r kfifo3/drivers/scsi/libiscsi.c kfifo4/drivers/scsi/libiscsi.c
--- kfifo3/drivers/scsi/libiscsi.c 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/drivers/scsi/libiscsi.c 2009-10-19 21:21:36.000000000 +0200
@@ -431,7 +431,7 @@
if (conn->login_task == task)
return;
- kfifo_put(&session->cmdpool.queue, (void*)&task, sizeof(void*));
+ kfifo_in(&session->cmdpool.queue, (void*)&task, sizeof(void*));
if (sc) {
task->sc = NULL;
@@ -642,7 +642,7 @@
BUG_ON(conn->c_stage == ISCSI_CONN_INITIAL_STAGE);
BUG_ON(conn->c_stage == ISCSI_CONN_STOPPED);
- if (!kfifo_get(&session->cmdpool.queue,
+ if (!kfifo_out(&session->cmdpool.queue,
(void*)&task, sizeof(void*)))
return NULL;
}
@@ -1473,7 +1473,7 @@
{
struct iscsi_task *task;
- if (!kfifo_get(&conn->session->cmdpool.queue,
+ if (!kfifo_out(&conn->session->cmdpool.queue,
(void *) &task, sizeof(void *)))
return NULL;
@@ -2260,7 +2260,7 @@
q->max = i;
goto enomem;
}
- kfifo_put(&q->queue, (void*)&q->pool[i], sizeof(void*));
+ kfifo_in(&q->queue, (void*)&q->pool[i], sizeof(void*));
}
if (items) {
@@ -2609,7 +2609,7 @@
/* allocate login_task used for the login/text sequences */
spin_lock_bh(&session->lock);
- if (!kfifo_get(&session->cmdpool.queue,
+ if (!kfifo_out(&session->cmdpool.queue,
(void*)&conn->login_task,
sizeof(void*))) {
spin_unlock_bh(&session->lock);
@@ -2629,7 +2629,7 @@
return cls_conn;
login_task_data_alloc_fail:
- kfifo_put(&session->cmdpool.queue, (void*)&conn->login_task,
+ kfifo_in(&session->cmdpool.queue, (void*)&conn->login_task,
sizeof(void*));
login_task_alloc_fail:
iscsi_destroy_conn(cls_conn);
@@ -2692,7 +2692,7 @@
free_pages((unsigned long) conn->data,
get_order(ISCSI_DEF_MAX_RECV_SEG_LEN));
kfree(conn->persistent_address);
- kfifo_put(&session->cmdpool.queue, (void*)&conn->login_task,
+ kfifo_in(&session->cmdpool.queue, (void*)&conn->login_task,
sizeof(void*));
if (session->leadconn == conn)
session->leadconn = NULL;
diff -u -N -r kfifo3/drivers/scsi/libiscsi_tcp.c kfifo4/drivers/scsi/libiscsi_tcp.c
--- kfifo3/drivers/scsi/libiscsi_tcp.c 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/drivers/scsi/libiscsi_tcp.c 2009-10-19 21:21:36.000000000 +0200
@@ -445,15 +445,15 @@
return;
/* flush task's r2t queues */
- while (kfifo_get(&tcp_task->r2tqueue, (void*)&r2t, sizeof(void*))) {
- kfifo_put(&tcp_task->r2tpool.queue, (void*)&r2t,
+ while (kfifo_out(&tcp_task->r2tqueue, (void*)&r2t, sizeof(void*))) {
+ kfifo_in(&tcp_task->r2tpool.queue, (void*)&r2t,
sizeof(void*));
ISCSI_DBG_TCP(task->conn, "pending r2t dropped\n");
}
r2t = tcp_task->r2t;
if (r2t != NULL) {
- kfifo_put(&tcp_task->r2tpool.queue, (void*)&r2t,
+ kfifo_in(&tcp_task->r2tpool.queue, (void*)&r2t,
sizeof(void*));
tcp_task->r2t = NULL;
}
@@ -541,7 +541,7 @@
return 0;
}
- rc = kfifo_get(&tcp_task->r2tpool.queue, (void*)&r2t, sizeof(void*));
+ rc = kfifo_out(&tcp_task->r2tpool.queue, (void*)&r2t, sizeof(void*));
if (!rc) {
iscsi_conn_printk(KERN_ERR, conn, "Could not allocate R2T. "
"Target has sent more R2Ts than it "
@@ -554,7 +554,7 @@
if (r2t->data_length == 0) {
iscsi_conn_printk(KERN_ERR, conn,
"invalid R2T with zero data len\n");
- kfifo_put(&tcp_task->r2tpool.queue, (void*)&r2t,
+ kfifo_in(&tcp_task->r2tpool.queue, (void*)&r2t,
sizeof(void*));
return ISCSI_ERR_DATALEN;
}
@@ -570,7 +570,7 @@
"invalid R2T with data len %u at offset %u "
"and total length %d\n", r2t->data_length,
r2t->data_offset, scsi_out(task->sc)->length);
- kfifo_put(&tcp_task->r2tpool.queue, (void*)&r2t,
+ kfifo_in(&tcp_task->r2tpool.queue, (void*)&r2t,
sizeof(void*));
return ISCSI_ERR_DATALEN;
}
@@ -580,7 +580,7 @@
r2t->sent = 0;
tcp_task->exp_datasn = r2tsn + 1;
- kfifo_put(&tcp_task->r2tqueue, (void*)&r2t, sizeof(void*));
+ kfifo_in(&tcp_task->r2tqueue, (void*)&r2t, sizeof(void*));
conn->r2t_pdus_cnt++;
iscsi_requeue_task(task);
@@ -982,7 +982,7 @@
if (r2t->data_length <= r2t->sent) {
ISCSI_DBG_TCP(task->conn,
" done with r2t %p\n", r2t);
- kfifo_put(&tcp_task->r2tpool.queue,
+ kfifo_in(&tcp_task->r2tpool.queue,
(void *)&tcp_task->r2t,
sizeof(void *));
tcp_task->r2t = r2t = NULL;
@@ -990,7 +990,7 @@
}
if (r2t == NULL) {
- kfifo_get(&tcp_task->r2tqueue,
+ kfifo_out(&tcp_task->r2tqueue,
(void *)&tcp_task->r2t, sizeof(void *));
r2t = tcp_task->r2t;
}
diff -u -N -r kfifo3/drivers/scsi/libsrp.c kfifo4/drivers/scsi/libsrp.c
--- kfifo3/drivers/scsi/libsrp.c 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/drivers/scsi/libsrp.c 2009-10-19 21:21:36.000000000 +0200
@@ -61,7 +61,7 @@
kfifo_init(&q->queue, (void *) q->pool, max * sizeof(void *));
for (i = 0, iue = q->items; i < max; i++) {
- kfifo_put(&q->queue, (void *) &iue, sizeof(void *));
+ kfifo_in(&q->queue, (void *) &iue, sizeof(void *));
iue->sbuf = ring[i];
iue++;
}
@@ -164,7 +164,7 @@
{
struct iu_entry *iue = NULL;
- kfifo_get_locked(&target->iu_queue.queue, (void *) &iue,
+ kfifo_out_locked(&target->iu_queue.queue, (void *) &iue,
sizeof(void *), &target->iu_queue.lock);
if (!iue)
return iue;
@@ -177,7 +177,7 @@
void srp_iu_put(struct iu_entry *iue)
{
- kfifo_put_locked(&iue->target->iu_queue.queue, (void *) &iue,
+ kfifo_in_locked(&iue->target->iu_queue.queue, (void *) &iue,
sizeof(void *), &iue->target->iu_queue.lock);
}
EXPORT_SYMBOL_GPL(srp_iu_put);
diff -u -N -r kfifo3/drivers/usb/host/fhci.h kfifo4/drivers/usb/host/fhci.h
--- kfifo3/drivers/usb/host/fhci.h 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/drivers/usb/host/fhci.h 2009-10-19 21:21:36.000000000 +0200
@@ -510,14 +510,14 @@
static inline int cq_put(struct kfifo *kfifo, void *p)
{
- return kfifo_put(kfifo, (void *)&p, sizeof(p));
+ return kfifo_in(kfifo, (void *)&p, sizeof(p));
}
static inline void *cq_get(struct kfifo *kfifo)
{
void *p = NULL;
- kfifo_get(kfifo, (void *)&p, sizeof(p));
+ kfifo_out(kfifo, (void *)&p, sizeof(p));
return p;
}
diff -u -N -r kfifo3/drivers/usb/serial/generic.c kfifo4/drivers/usb/serial/generic.c
--- kfifo3/drivers/usb/serial/generic.c 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/drivers/usb/serial/generic.c 2009-10-19 21:21:36.000000000 +0200
@@ -285,7 +285,7 @@
return 0;
data = port->write_urb->transfer_buffer;
- count = kfifo_get_locked(port->write_fifo, data, port->bulk_out_size, &port->lock);
+ count = kfifo_out_locked(port->write_fifo, data, port->bulk_out_size, &port->lock);
usb_serial_debug_data(debug, &port->dev, __func__, count, data);
/* set up our urb */
@@ -345,7 +345,7 @@
return usb_serial_multi_urb_write(tty, port,
buf, count);
- count = kfifo_put_locked(port->write_fifo, buf, count, &port->lock);
+ count = kfifo_in_locked(port->write_fifo, buf, count, &port->lock);
result = usb_serial_generic_write_start(port);
if (result >= 0)
diff -u -N -r kfifo3/include/linux/kfifo.h kfifo4/include/linux/kfifo.h
--- kfifo3/include/linux/kfifo.h 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/include/linux/kfifo.h 2009-10-19 21:21:36.000000000 +0200
@@ -19,6 +19,25 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
+
+/*
+ * Howto porting drivers to the new generic fifo API:
+ *
+ * - Modify the declaration of the "struct kfifo *" object into a
+ * in-place "struct kfifo" object
+ * - Init the in-place object with kfifo_alloc() or kfifo_init()
+ * Note: The address of the in-place "struct kfifo" object must be
+ * passed as the first argument to this functions
+ * - Replace the use of __kfifo_put into kfifo_in and __kfifo_get
+ * into kfifo_out
+ * - Replace the use of kfifo_put into kfifo_in_locked and kfifo_get
+ * into kfifo_out_locked
+ * Note: the spinlock pointer formerly passed to kfifo_init/kfifo_alloc
+ * must be passed now to the kfifo_in_locked and kfifo_out_locked
+ * as the last parameter.
+ * - All formerly name __kfifo_* functions has been renamed into kfifo_*
+ */
+
#ifndef _LINUX_KFIFO_H
#define _LINUX_KFIFO_H
@@ -37,10 +56,10 @@
extern __must_check int kfifo_alloc(struct kfifo *fifo, unsigned int size,
gfp_t gfp_mask);
extern void kfifo_free(struct kfifo *fifo);
-extern unsigned int kfifo_put(struct kfifo *fifo,
- const unsigned char *buffer, unsigned int len);
-extern unsigned int kfifo_get(struct kfifo *fifo,
- unsigned char *buffer, unsigned int len);
+extern __must_check unsigned int kfifo_in(struct kfifo *fifo,
+ const unsigned char *from, unsigned int len);
+extern __must_check unsigned int kfifo_out(struct kfifo *fifo,
+ unsigned char *to, unsigned int len);
/**
* kfifo_reset - removes the entire FIFO contents
@@ -65,7 +84,7 @@
}
/**
- * kfifo_put_locked - puts some data into the FIFO using a spinlock for locking
+ * kfifo_in_locked - puts some data into the FIFO using a spinlock for locking
* @fifo: the fifo to be used.
* @from: the data to be added.
* @len: the length of the data to be added.
@@ -75,7 +94,7 @@
* the FIFO depending on the free space, and returns the number of
* bytes copied.
*/
-static inline __must_check unsigned int kfifo_put_locked(struct kfifo *fifo,
+static inline __must_check unsigned int kfifo_in_locked(struct kfifo *fifo,
const unsigned char *from, unsigned int n, spinlock_t *lock)
{
unsigned long flags;
@@ -83,7 +102,7 @@
spin_lock_irqsave(lock, flags);
- ret = kfifo_put(fifo, from, n);
+ ret = kfifo_in(fifo, from, n);
spin_unlock_irqrestore(lock, flags);
@@ -91,7 +110,7 @@
}
/**
- * kfifo_get_locked - gets some data from the FIFO using a spinlock for locking
+ * kfifo_out_locked - gets some data from the FIFO using a spinlock for locking
* @fifo: the fifo to be used.
* @to: where the data must be copied.
* @len: the size of the destination buffer.
@@ -100,7 +119,7 @@
* This function copies at most @len bytes from the FIFO into the
* @to buffer and returns the number of copied bytes.
*/
-static inline __must_check unsigned int kfifo_get_locked(struct kfifo *fifo,
+static inline __must_check unsigned int kfifo_out_locked(struct kfifo *fifo,
unsigned char *to, unsigned int n, spinlock_t *lock)
{
unsigned long flags;
@@ -108,7 +127,7 @@
spin_lock_irqsave(lock, flags);
- ret = kfifo_get(fifo, to, n);
+ ret = kfifo_out(fifo, to, n);
/*
* optimization: if the FIFO is empty, set the indices to 0
diff -u -N -r kfifo3/kernel/kfifo.c kfifo4/kernel/kfifo.c
--- kfifo3/kernel/kfifo.c 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/kernel/kfifo.c 2009-10-19 21:21:36.000000000 +0200
@@ -100,20 +100,20 @@
EXPORT_SYMBOL(kfifo_free);
/**
- * kfifo_put - puts some data into the FIFO, no locking version
+ * kfifo_in - puts some data into the FIFO
* @fifo: the fifo to be used.
- * @buffer: the data to be added.
+ * @from: the data to be added.
* @len: the length of the data to be added.
*
- * This function copies at most @len bytes from the @buffer into
+ * This function copies at most @len bytes from the @from buffer into
* the FIFO depending on the free space, and returns the number of
* bytes copied.
*
* Note that with only one concurrent reader and one concurrent
* writer, you don't need extra locking to use these functions.
*/
-unsigned int kfifo_put(struct kfifo *fifo,
- const unsigned char *buffer, unsigned int len)
+unsigned int kfifo_in(struct kfifo *fifo,
+ const unsigned char *from, unsigned int len)
{
unsigned int l;
@@ -128,10 +128,10 @@
/* first put the data starting from fifo->in to buffer end */
l = min(len, fifo->size - (fifo->in & (fifo->size - 1)));
- memcpy(fifo->buffer + (fifo->in & (fifo->size - 1)), buffer, l);
+ memcpy(fifo->buffer + (fifo->in & (fifo->size - 1)), from, l);
/* then put the rest (if any) at the beginning of the buffer */
- memcpy(fifo->buffer, buffer + l, len - l);
+ memcpy(fifo->buffer, from + l, len - l);
/*
* Ensure that we add the bytes to the kfifo -before-
@@ -144,22 +144,22 @@
return len;
}
-EXPORT_SYMBOL(kfifo_put);
+EXPORT_SYMBOL(kfifo_in);
/**
- * kfifo_get - gets some data from the FIFO, no locking version
+ * kfifo_out - gets some data from the FIFO
* @fifo: the fifo to be used.
- * @buffer: where the data must be copied.
+ * @to: where the data must be copied.
* @len: the size of the destination buffer.
*
* This function copies at most @len bytes from the FIFO into the
- * @buffer and returns the number of copied bytes.
+ * @to buffer and returns the number of copied bytes.
*
* Note that with only one concurrent reader and one concurrent
* writer, you don't need extra locking to use these functions.
*/
-unsigned int kfifo_get(struct kfifo *fifo,
- unsigned char *buffer, unsigned int len)
+unsigned int kfifo_out(struct kfifo *fifo,
+ unsigned char *to, unsigned int len)
{
unsigned int l;
@@ -174,10 +174,10 @@
/* first get the data from fifo->out until the end of the buffer */
l = min(len, fifo->size - (fifo->out & (fifo->size - 1)));
- memcpy(buffer, fifo->buffer + (fifo->out & (fifo->size - 1)), l);
+ memcpy(to, fifo->buffer + (fifo->out & (fifo->size - 1)), l);
/* then get the rest (if any) from the beginning of the buffer */
- memcpy(buffer + l, fifo->buffer, len - l);
+ memcpy(to + l, fifo->buffer, len - l);
/*
* Ensure that we remove the bytes from the kfifo -before-
@@ -190,4 +190,4 @@
return len;
}
-EXPORT_SYMBOL(kfifo_get);
+EXPORT_SYMBOL(kfifo_out);
diff -u -N -r kfifo3/net/dccp/probe.c kfifo4/net/dccp/probe.c
--- kfifo3/net/dccp/probe.c 2009-10-19 21:13:38.000000000 +0200
+++ kfifo4/net/dccp/probe.c 2009-10-19 21:21:36.000000000 +0200
@@ -67,7 +67,7 @@
len += vscnprintf(tbuf+len, sizeof(tbuf)-len, fmt, args);
va_end(args);
- kfifo_put_locked(&dccpw.fifo, tbuf, len, &dccpw.lock);
+ kfifo_in_locked(&dccpw.fifo, tbuf, len, &dccpw.lock);
wake_up(&dccpw.wait);
}
@@ -136,7 +136,7 @@
if (error)
goto out_free;
- cnt = kfifo_get_locked(&dccpw.fifo, tbuf, len, &dccpw.lock);
+ cnt = kfifo_out_locked(&dccpw.fifo, tbuf, len, &dccpw.lock);
error = copy_to_user(buf, tbuf, cnt) ? -EFAULT : 0;
out_free:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists