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: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Link: https://lkml.kernel.org/r/20210806152551.qio7c3ho6pexezup@linutronix.de
Link: https://lore.kernel.org/r/20210923172918.o22iwgvn3w7ilh44@linutronix.de
Acked-by: Stefani Seibold <stefani@seibold.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/samples/kfifo/bytestream-example.c b/samples/kfifo/bytestream-example.c
index 5a90aa527877551707ec74691c2d4d6b5630c90e..642d0748c1695ef80d59c1d5bc7926a5a563fb55 100644 (file)
--- a/samples/kfifo/bytestream-example.c
+++ b/samples/kfifo/bytestream-example.c
@@ -22,10 +22,10 @@
 #define        PROC_FIFO       "bytestream-fifo"
 
 /* lock for procfs read access */
-static DEFINE_MUTEX(read_lock);
+static DEFINE_MUTEX(read_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.
@@ -116,12 +116,12 @@ static ssize_t fifo_write(struct file *file, const char __user *buf,
        int ret;
        unsigned int copied;
 
-       if (mutex_lock_interruptible(&write_lock))
+       if (mutex_lock_interruptible(&write_access))
                return -ERESTARTSYS;
 
        ret = kfifo_from_user(&test, buf, count, &copied);
 
-       mutex_unlock(&write_lock);
+       mutex_unlock(&write_access);
        if (ret)
                return ret;
 
@@ -134,12 +134,12 @@ static ssize_t fifo_read(struct file *file, char __user *buf,
        int ret;
        unsigned int copied;
 
-       if (mutex_lock_interruptible(&read_lock))
+       if (mutex_lock_interruptible(&read_access))
                return -ERESTARTSYS;
 
        ret = kfifo_to_user(&test, buf, count, &copied);
 
-       mutex_unlock(&read_lock);
+       mutex_unlock(&read_access);
        if (ret)
                return ret;
 

diff --git a/samples/kfifo/inttype-example.c b/samples/kfifo/inttype-example.c
index e5403d8c971a5bb7f4ce6dff835ed2a5b7efda35..c61482ba94f4de11a0eebb5483c483f865cbebe0 100644 (file)
--- a/samples/kfifo/inttype-example.c
+++ b/samples/kfifo/inttype-example.c
@@ -22,10 +22,10 @@
 #define        PROC_FIFO       "int-fifo"
 
 /* lock for procfs read access */
-static DEFINE_MUTEX(read_lock);
+static DEFINE_MUTEX(read_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.
@@ -109,12 +109,12 @@ static ssize_t fifo_write(struct file *file, const char __user *buf,
        int ret;
        unsigned int copied;
 
-       if (mutex_lock_interruptible(&write_lock))
+       if (mutex_lock_interruptible(&write_access))
                return -ERESTARTSYS;
 
        ret = kfifo_from_user(&test, buf, count, &copied);
 
-       mutex_unlock(&write_lock);
+       mutex_unlock(&write_access);
        if (ret)
                return ret;
 
@@ -127,12 +127,12 @@ static ssize_t fifo_read(struct file *file, char __user *buf,
        int ret;
        unsigned int copied;
 
-       if (mutex_lock_interruptible(&read_lock))
+       if (mutex_lock_interruptible(&read_access))
                return -ERESTARTSYS;
 
        ret = kfifo_to_user(&test, buf, count, &copied);
 
-       mutex_unlock(&read_lock);
+       mutex_unlock(&read_access);
        if (ret)
                return ret;
 

diff --git a/samples/kfifo/record-example.c b/samples/kfifo/record-example.c
index f64f3d62d6c2a4b93e50ef0f6424b8072d6770c7..e4087b2d3fc4b261419fd012f2322a05bf5744c1 100644 (file)
--- a/samples/kfifo/record-example.c
+++ b/samples/kfifo/record-example.c
@@ -22,10 +22,10 @@
 #define        PROC_FIFO       "record-fifo"
 
 /* lock for procfs read access */
-static DEFINE_MUTEX(read_lock);
+static DEFINE_MUTEX(read_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.
@@ -123,12 +123,12 @@ static ssize_t fifo_write(struct file *file, const char __user *buf,
        int ret;
        unsigned int copied;
 
-       if (mutex_lock_interruptible(&write_lock))
+       if (mutex_lock_interruptible(&write_access))
                return -ERESTARTSYS;
 
        ret = kfifo_from_user(&test, buf, count, &copied);
 
-       mutex_unlock(&write_lock);
+       mutex_unlock(&write_access);
        if (ret)
                return ret;
 
@@ -141,12 +141,12 @@ static ssize_t fifo_read(struct file *file, char __user *buf,
        int ret;
        unsigned int copied;
 
-       if (mutex_lock_interruptible(&read_lock))
+       if (mutex_lock_interruptible(&read_access))
                return -ERESTARTSYS;
 
        ret = kfifo_to_user(&test, buf, count, &copied);
 
-       mutex_unlock(&read_lock);
+       mutex_unlock(&read_access);
        if (ret)
                return ret;