down_trylock -> down_try in documentation and comments. Fix up kernel-locking.tmpl and random bitching about down_trylock. Signed-off-by: Rusty Russell --- fs/ocfs2/inode.c | 4 ---- include/linux/mutex.h | 4 ---- kernel/mutex.c | 4 ++-- 3 files changed, 2 insertions(+), 10 deletions(-) diff -r 3d722fb58b55 fs/ocfs2/inode.c --- a/fs/ocfs2/inode.c Tue May 06 20:31:37 2008 +1000 +++ b/fs/ocfs2/inode.c Tue May 06 20:32:24 2008 +1000 @@ -1062,10 +1062,6 @@ void ocfs2_clear_inode(struct inode *ino (unsigned long long)oi->ip_blkno); mutex_unlock(&oi->ip_io_mutex); - /* - * down_trylock() returns 0, down_write_trylock() returns 1 - * kernel 1, world 0 - */ mlog_bug_on_msg(!down_write_trylock(&oi->ip_alloc_sem), "Clear inode of %llu, alloc_sem is locked\n", (unsigned long long)oi->ip_blkno); diff -r 3d722fb58b55 include/linux/mutex.h --- a/include/linux/mutex.h Tue May 06 20:31:37 2008 +1000 +++ b/include/linux/mutex.h Tue May 06 20:32:24 2008 +1000 @@ -141,10 +141,6 @@ extern int __must_check mutex_lock_killa # define mutex_lock_killable_nested(lock, subclass) mutex_lock_killable(lock) #endif -/* - * NOTE: mutex_trylock() follows the spin_trylock() convention, - * not the down_trylock() convention! - */ extern int mutex_trylock(struct mutex *lock); extern void mutex_unlock(struct mutex *lock); diff -r 3d722fb58b55 kernel/mutex.c --- a/kernel/mutex.c Tue May 06 20:31:37 2008 +1000 +++ b/kernel/mutex.c Tue May 06 20:32:24 2008 +1000 @@ -373,8 +373,8 @@ static inline int __mutex_trylock_slowpa * Try to acquire the mutex atomically. Returns 1 if the mutex * has been acquired successfully, and 0 on contention. * - * NOTE: this function follows the spin_trylock() convention, so - * it is negated to the down_trylock() return values! Be careful + * NOTE: this function follows the spin_trylock()/down_try() convention, + * so it is negated to the old down_trylock() return values! Be careful * about this when converting semaphore users to mutexes. * * This function must not be used in interrupt context. The