Commit 880732ae authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Greg Kroah-Hartman

samples/kfifo: Rename read_lock/write_lock

The variables names read_lock and write_lock can clash with functions used for
read/writer locks.

Rename read_lock to read_access and write_lock to write_access to avoid a name
collision.
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Link: https://lkml.kernel.org/r/20210806152551.qio7c3ho6pexezup@linutronix.de
Link: https://lore.kernel.org/r/20210923172918.o22iwgvn3w7ilh44@linutronix.deAcked-by: default avatarStefani Seibold <stefani@seibold.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85385a51
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
#define PROC_FIFO "bytestream-fifo" #define PROC_FIFO "bytestream-fifo"
/* lock for procfs read access */ /* lock for procfs read access */
static DEFINE_MUTEX(read_lock); static DEFINE_MUTEX(read_access);
/* lock for procfs write access */ /* lock for procfs write access */
static DEFINE_MUTEX(write_lock); static DEFINE_MUTEX(write_access);
/* /*
* define DYNAMIC in this example for a dynamically allocated fifo. * define DYNAMIC in this example for a dynamically allocated fifo.
...@@ -116,12 +116,12 @@ static ssize_t fifo_write(struct file *file, const char __user *buf, ...@@ -116,12 +116,12 @@ static ssize_t fifo_write(struct file *file, const char __user *buf,
int ret; int ret;
unsigned int copied; unsigned int copied;
if (mutex_lock_interruptible(&write_lock)) if (mutex_lock_interruptible(&write_access))
return -ERESTARTSYS; return -ERESTARTSYS;
ret = kfifo_from_user(&test, buf, count, &copied); ret = kfifo_from_user(&test, buf, count, &copied);
mutex_unlock(&write_lock); mutex_unlock(&write_access);
if (ret) if (ret)
return ret; return ret;
...@@ -134,12 +134,12 @@ static ssize_t fifo_read(struct file *file, char __user *buf, ...@@ -134,12 +134,12 @@ static ssize_t fifo_read(struct file *file, char __user *buf,
int ret; int ret;
unsigned int copied; unsigned int copied;
if (mutex_lock_interruptible(&read_lock)) if (mutex_lock_interruptible(&read_access))
return -ERESTARTSYS; return -ERESTARTSYS;
ret = kfifo_to_user(&test, buf, count, &copied); ret = kfifo_to_user(&test, buf, count, &copied);
mutex_unlock(&read_lock); mutex_unlock(&read_access);
if (ret) if (ret)
return ret; return ret;
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
#define PROC_FIFO "int-fifo" #define PROC_FIFO "int-fifo"
/* lock for procfs read access */ /* lock for procfs read access */
static DEFINE_MUTEX(read_lock); static DEFINE_MUTEX(read_access);
/* lock for procfs write access */ /* lock for procfs write access */
static DEFINE_MUTEX(write_lock); static DEFINE_MUTEX(write_access);
/* /*
* define DYNAMIC in this example for a dynamically allocated fifo. * define DYNAMIC in this example for a dynamically allocated fifo.
...@@ -109,12 +109,12 @@ static ssize_t fifo_write(struct file *file, const char __user *buf, ...@@ -109,12 +109,12 @@ static ssize_t fifo_write(struct file *file, const char __user *buf,
int ret; int ret;
unsigned int copied; unsigned int copied;
if (mutex_lock_interruptible(&write_lock)) if (mutex_lock_interruptible(&write_access))
return -ERESTARTSYS; return -ERESTARTSYS;
ret = kfifo_from_user(&test, buf, count, &copied); ret = kfifo_from_user(&test, buf, count, &copied);
mutex_unlock(&write_lock); mutex_unlock(&write_access);
if (ret) if (ret)
return ret; return ret;
...@@ -127,12 +127,12 @@ static ssize_t fifo_read(struct file *file, char __user *buf, ...@@ -127,12 +127,12 @@ static ssize_t fifo_read(struct file *file, char __user *buf,
int ret; int ret;
unsigned int copied; unsigned int copied;
if (mutex_lock_interruptible(&read_lock)) if (mutex_lock_interruptible(&read_access))
return -ERESTARTSYS; return -ERESTARTSYS;
ret = kfifo_to_user(&test, buf, count, &copied); ret = kfifo_to_user(&test, buf, count, &copied);
mutex_unlock(&read_lock); mutex_unlock(&read_access);
if (ret) if (ret)
return ret; return ret;
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
#define PROC_FIFO "record-fifo" #define PROC_FIFO "record-fifo"
/* lock for procfs read access */ /* lock for procfs read access */
static DEFINE_MUTEX(read_lock); static DEFINE_MUTEX(read_access);
/* lock for procfs write access */ /* lock for procfs write access */
static DEFINE_MUTEX(write_lock); static DEFINE_MUTEX(write_access);
/* /*
* define DYNAMIC in this example for a dynamically allocated fifo. * define DYNAMIC in this example for a dynamically allocated fifo.
...@@ -123,12 +123,12 @@ static ssize_t fifo_write(struct file *file, const char __user *buf, ...@@ -123,12 +123,12 @@ static ssize_t fifo_write(struct file *file, const char __user *buf,
int ret; int ret;
unsigned int copied; unsigned int copied;
if (mutex_lock_interruptible(&write_lock)) if (mutex_lock_interruptible(&write_access))
return -ERESTARTSYS; return -ERESTARTSYS;
ret = kfifo_from_user(&test, buf, count, &copied); ret = kfifo_from_user(&test, buf, count, &copied);
mutex_unlock(&write_lock); mutex_unlock(&write_access);
if (ret) if (ret)
return ret; return ret;
...@@ -141,12 +141,12 @@ static ssize_t fifo_read(struct file *file, char __user *buf, ...@@ -141,12 +141,12 @@ static ssize_t fifo_read(struct file *file, char __user *buf,
int ret; int ret;
unsigned int copied; unsigned int copied;
if (mutex_lock_interruptible(&read_lock)) if (mutex_lock_interruptible(&read_access))
return -ERESTARTSYS; return -ERESTARTSYS;
ret = kfifo_to_user(&test, buf, count, &copied); ret = kfifo_to_user(&test, buf, count, &copied);
mutex_unlock(&read_lock); mutex_unlock(&read_access);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment