The patch titled
semaphores: introduce down_try() so we can move away from down_trylock()
has been removed from the -mm tree. Its filename was
introduce-down_try-so-we-can-move-away-from-down_trylock.patch
This patch was dropped because of pain integrating it with linux-next. Sorry.
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: semaphores: introduce down_try() so we can move away from down_trylock()
From: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
I planned 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~introduce-down_try-so-we-can-move-away-from-down_trylock include/linux/semaphore.h
--- a/include/linux/semaphore.h~introduce-down_try-so-we-can-move-away-from-down_trylock
+++ a/include/linux/semaphore.h
@@ -46,4 +46,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 bool __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
introduce-down_try-so-we-can-move-away-from-down_trylock.patch
scripts-mod-modpostc-fix-spelling-of-module-and-happens.patch
linux-next.patch
modules-extend-initcall_debug-functionality-to-the-module-loader.patch
kernel-call-constructors.patch
kernel-introduce-gcc_version_lower-macro.patch
seq_file-add-function-to-write-binary-data.patch
gcov-add-gcov-profiling-infrastructure.patch
gcov-add-gcov-profiling-infrastructure-revert-link-changes.patch
gcov-create-links-to-gcda-files-in-build-directory.patch
gcov-architecture-specific-compile-flag-adjustments.patch
gcov-architecture-specific-compile-flag-adjustments-powerpc-moved-stuff.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
