The patch titled semaphore: introduce down_try() has been added to the -mm tree. Its filename is semaphore-introduce-down_try.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: semaphore: introduce down_try() From: Rusty Russell <rusty@xxxxxxxxxxxxxxx> I plan on removing the much-disliked down_trylock() (with its backwards return codes) in 2.6.27, but it's creating something of a logjam with other patches in -mm and linux-next. Andrew suggested introducing "down_try" as a wrapper now, to make the transition easier. Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx> Cc: Matthew Wilcox <matthew@xxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/semaphore.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff -puN include/linux/semaphore.h~semaphore-introduce-down_try include/linux/semaphore.h --- a/include/linux/semaphore.h~semaphore-introduce-down_try +++ a/include/linux/semaphore.h @@ -48,4 +48,18 @@ extern int __must_check down_trylock(str extern int __must_check down_timeout(struct semaphore *sem, long jiffies); extern void up(struct semaphore *sem); +/** + * down_try - try to down a semaphore, but don't block + * @sem: the semaphore + * + * This is equivalent to down_trylock(), but has the same return codes as + * spin_trylock and mutex_trylock: 1 if semaphore acquired, 0 if not. + * + * down_trylock() with its confusing return codes will be deprecated + * soon. It will not be missed. + */ +static inline int __must_check down_try(struct semaphore *sem) +{ + return !down_trylock(sem); +} #endif /* __LINUX_SEMAPHORE_H */ _ Patches currently in -mm which might be from rusty@xxxxxxxxxxxxxxx are semaphore-introduce-down_try.patch linux-next.patch lguest-use-cpu-capability-accessors.patch percpu-introduce-define_per_cpu_page_aligned.patch reiser4.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html