Commit a02137eb authored Apr 07, 2016 by Michal Hocko Committed by Ingo Molnar Apr 13, 2016

locking/rwsem, ia64: Provide __down_write_killable()

Introduce ___down_write() for the fast path and reuse it for __down_write()
resp. __down_write_killable() each using the respective generic slow path
(rwsem_down_write_failed() resp. rwsem_down_write_failed_killable()).

Signed-off-by: Michal Hocko <mhocko@suse.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Chris Zankel <chris@zankel.net>
Cc: David S. Miller <davem@davemloft.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Cc: Signed-off-by: Jason Low <jason.low2@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linux-sh@vger.kernel.org
Cc: linux-xtensa@linux-xtensa.org
Cc: sparclinux@vger.kernel.org
Link: http://lkml.kernel.org/r/1460041951-22347-9-git-send-email-mhocko@kernel.org

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 7deb5eeb

arch/ia64/include/asm/rwsem.h

+19 −3

Original line number	Diff line number	Diff line
		@@ -49,8 +49,8 @@ __down_read (struct rw_semaphore *sem)
		/*
		* lock for writing
		*/
		static inline void
		__down_write (struct rw_semaphore *sem)
		static inline long
		___down_write (struct rw_semaphore *sem)
		{
		long old, new;

		@@ -59,10 +59,26 @@ __down_write (struct rw_semaphore *sem)
		new = old + RWSEM_ACTIVE_WRITE_BIAS;
		} while (cmpxchg_acq(&sem->count, old, new) != old);

		if (old != 0)
		return old;
		}

		static inline void
		__down_write (struct rw_semaphore *sem)
		{
		if (___down_write(sem))
		rwsem_down_write_failed(sem);
		}

		static inline int
		__down_write_killable (struct rw_semaphore *sem)
		{
		if (___down_write(sem))
		if (IS_ERR(rwsem_down_write_failed_killable(sem)))
		return -EINTR;

		return 0;
		}

		/*
		* unlock after reading
		*/