Linux 6.9-rc6

[sfrench/cifs-2.6.git] / samples / kfifo / inttype-example.c

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;