Skip to content

Commit 11b80f4

Browse files
Christoph HellwigAl Viro
authored andcommitted
rw_semaphore: remove up/down_read_non_owner
Now that the last users is gone these can be removed. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Al Viro <[email protected]>
1 parent bd5fe6c commit 11b80f4

File tree

2 files changed

+0
-26
lines changed

2 files changed

+0
-26
lines changed

include/linux/rwsem.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,9 @@ extern void downgrade_write(struct rw_semaphore *sem);
124124
*/
125125
extern void down_read_nested(struct rw_semaphore *sem, int subclass);
126126
extern void down_write_nested(struct rw_semaphore *sem, int subclass);
127-
/*
128-
* Take/release a lock when not the owner will release it.
129-
*
130-
* [ This API should be avoided as much as possible - the
131-
* proper abstraction for this case is completions. ]
132-
*/
133-
extern void down_read_non_owner(struct rw_semaphore *sem);
134-
extern void up_read_non_owner(struct rw_semaphore *sem);
135127
#else
136128
# define down_read_nested(sem, subclass) down_read(sem)
137129
# define down_write_nested(sem, subclass) down_write(sem)
138-
# define down_read_non_owner(sem) down_read(sem)
139-
# define up_read_non_owner(sem) up_read(sem)
140130
#endif
141131

142132
#endif /* _LINUX_RWSEM_H */

kernel/rwsem.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,6 @@ void down_read_nested(struct rw_semaphore *sem, int subclass)
117117

118118
EXPORT_SYMBOL(down_read_nested);
119119

120-
void down_read_non_owner(struct rw_semaphore *sem)
121-
{
122-
might_sleep();
123-
124-
__down_read(sem);
125-
}
126-
127-
EXPORT_SYMBOL(down_read_non_owner);
128-
129120
void down_write_nested(struct rw_semaphore *sem, int subclass)
130121
{
131122
might_sleep();
@@ -136,13 +127,6 @@ void down_write_nested(struct rw_semaphore *sem, int subclass)
136127

137128
EXPORT_SYMBOL(down_write_nested);
138129

139-
void up_read_non_owner(struct rw_semaphore *sem)
140-
{
141-
__up_read(sem);
142-
}
143-
144-
EXPORT_SYMBOL(up_read_non_owner);
145-
146130
#endif
147131

148132

0 commit comments

Comments
 (0)