From 216dc063fcb78fcc7336295124971c5a2d6171b8 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Fri, 24 Jun 2011 14:29:44 -0400
Subject: [PATCH] --- yaml --- r: 257379 b: refs/heads/master c:
 11b80f459adaf91a712f95e7734a17655a36bf30 h: refs/heads/master i:   257377:
 849b4bb18bccbaf032e546ea773d0640a3cda8ca   257375:
 af62baea252c06282ba926012bbb5dce0005429c v: v3

---
 [refs]                      |  2 +-
 trunk/include/linux/rwsem.h | 10 ----------
 trunk/kernel/rwsem.c        | 16 ----------------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 6f66e1123b20..7bac901ae90b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd5fe6c5eb9c548d7f07fe8f89a150bb6705e8e3
+refs/heads/master: 11b80f459adaf91a712f95e7734a17655a36bf30
diff --git a/trunk/include/linux/rwsem.h b/trunk/include/linux/rwsem.h
index a8afe9cd000c..77950dfa0a9e 100644
--- a/trunk/include/linux/rwsem.h
+++ b/trunk/include/linux/rwsem.h
@@ -124,19 +124,9 @@ extern void downgrade_write(struct rw_semaphore *sem);
  */
 extern void down_read_nested(struct rw_semaphore *sem, int subclass);
 extern void down_write_nested(struct rw_semaphore *sem, int subclass);
-/*
- * Take/release a lock when not the owner will release it.
- *
- * [ This API should be avoided as much as possible - the
- *   proper abstraction for this case is completions. ]
- */
-extern void down_read_non_owner(struct rw_semaphore *sem);
-extern void up_read_non_owner(struct rw_semaphore *sem);
 #else
 # define down_read_nested(sem, subclass)		down_read(sem)
 # define down_write_nested(sem, subclass)	down_write(sem)
-# define down_read_non_owner(sem)		down_read(sem)
-# define up_read_non_owner(sem)			up_read(sem)
 #endif
 
 #endif /* _LINUX_RWSEM_H */
diff --git a/trunk/kernel/rwsem.c b/trunk/kernel/rwsem.c
index cae050b05f5e..176e5e56ffab 100644
--- a/trunk/kernel/rwsem.c
+++ b/trunk/kernel/rwsem.c
@@ -117,15 +117,6 @@ void down_read_nested(struct rw_semaphore *sem, int subclass)
 
 EXPORT_SYMBOL(down_read_nested);
 
-void down_read_non_owner(struct rw_semaphore *sem)
-{
-	might_sleep();
-
-	__down_read(sem);
-}
-
-EXPORT_SYMBOL(down_read_non_owner);
-
 void down_write_nested(struct rw_semaphore *sem, int subclass)
 {
 	might_sleep();
@@ -136,13 +127,6 @@ void down_write_nested(struct rw_semaphore *sem, int subclass)
 
 EXPORT_SYMBOL(down_write_nested);
 
-void up_read_non_owner(struct rw_semaphore *sem)
-{
-	__up_read(sem);
-}
-
-EXPORT_SYMBOL(up_read_non_owner);
-
 #endif