Merge tag 'xfs-5.5-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux.git] / kernel / locking / rwsem.c

diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c
index eef04551eae712e02b8c44c02aaa2c06fbb49dc0..44e68761f43213144a61b0cd2b489cfd1b8358bd 100644 (file)
--- a/kernel/locking/rwsem.c
+++ b/kernel/locking/rwsem.c
@@ -1504,7 +1504,7 @@ int __sched down_read_killable(struct rw_semaphore *sem)
        rwsem_acquire_read(&sem->dep_map, 0, 0, _RET_IP_);
 
        if (LOCK_CONTENDED_RETURN(sem, __down_read_trylock, __down_read_killable)) {
-               rwsem_release(&sem->dep_map, 1, _RET_IP_);
+               rwsem_release(&sem->dep_map, _RET_IP_);
                return -EINTR;
        }
 
@@ -1546,7 +1546,7 @@ int __sched down_write_killable(struct rw_semaphore *sem)
 
        if (LOCK_CONTENDED_RETURN(sem, __down_write_trylock,
                                  __down_write_killable)) {
-               rwsem_release(&sem->dep_map, 1, _RET_IP_);
+               rwsem_release(&sem->dep_map, _RET_IP_);
                return -EINTR;
        }
 
@@ -1573,7 +1573,7 @@ EXPORT_SYMBOL(down_write_trylock);
  */
 void up_read(struct rw_semaphore *sem)
 {
-       rwsem_release(&sem->dep_map, 1, _RET_IP_);
+       rwsem_release(&sem->dep_map, _RET_IP_);
        __up_read(sem);
 }
 EXPORT_SYMBOL(up_read);
@@ -1583,7 +1583,7 @@ EXPORT_SYMBOL(up_read);
  */
 void up_write(struct rw_semaphore *sem)
 {
-       rwsem_release(&sem->dep_map, 1, _RET_IP_);
+       rwsem_release(&sem->dep_map, _RET_IP_);
        __up_write(sem);
 }
 EXPORT_SYMBOL(up_write);
@@ -1639,7 +1639,7 @@ int __sched down_write_killable_nested(struct rw_semaphore *sem, int subclass)
 
        if (LOCK_CONTENDED_RETURN(sem, __down_write_trylock,
                                  __down_write_killable)) {
-               rwsem_release(&sem->dep_map, 1, _RET_IP_);
+               rwsem_release(&sem->dep_map, _RET_IP_);
                return -EINTR;
        }