Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Michal Hocko and committed by
Ingo Molnar
a02137eb 7deb5eeb

+19 -3
+19 -3
arch/ia64/include/asm/rwsem.h
··· 49 49 /* 50 50 * lock for writing 51 51 */ 52 - static inline void 53 - __down_write (struct rw_semaphore *sem) 52 + static inline long 53 + ___down_write (struct rw_semaphore *sem) 54 54 { 55 55 long old, new; 56 56 ··· 59 59 new = old + RWSEM_ACTIVE_WRITE_BIAS; 60 60 } while (cmpxchg_acq(&sem->count, old, new) != old); 61 61 62 - if (old != 0) 62 + return old; 63 + } 64 + 65 + static inline void 66 + __down_write (struct rw_semaphore *sem) 67 + { 68 + if (___down_write(sem)) 63 69 rwsem_down_write_failed(sem); 70 + } 71 + 72 + static inline int 73 + __down_write_killable (struct rw_semaphore *sem) 74 + { 75 + if (___down_write(sem)) 76 + if (IS_ERR(rwsem_down_write_failed_killable(sem))) 77 + return -EINTR; 78 + 79 + return 0; 64 80 } 65 81 66 82 /*