Skip to contentSkip to conversation

semaphore: declare down_try

PATCH In review Jiri Slaby 2 participants 3 messages Jul 30, 2008

lore
Share & tools
lore

Jiri Slaby

author
#0 lore raw

PATCH 1/1 semaphore: declare down_try

Maybe you already fixed this, in todays mmotm there is a fix of duplicate down_try definiton, but this problem still persist.
--

down_trylock is superseded by down_try, but prototypes in header files remained unchanged.

Cc Rusty Russell <[email protected]>
---
 include/linux/semaphore.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/semaphore.h +1 -1
index 7415839..ca153ec 100644
@@ -42,7 +42,7 @@ static inline void sema_init(struct semaphore *sem, int val)
 extern void down(struct semaphore *sem);
 extern int __must_check down_interruptible(struct semaphore *sem);
 extern int __must_check down_killable(struct semaphore *sem);
-extern int __must_check down_trylock(struct semaphore *sem);
+extern int __must_check down_try(struct semaphore *sem);
 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
 extern void up(struct semaphore *sem);
 
Signature · 1 line
1.5.6.2
author
#1 lore raw

Jiri Slaby napsal(a):

Quoted 2 lines

Maybe you already fixed this, in todays mmotm there is a fix of duplicate down_try definiton, but this problem still persist.

BTW. there is still bunch of down_trylock(); users, are you about to eliminate them?

2 182 /home/latest/xxx/drivers/watchdog/ar7_wdt.c <<ar7_wdt_open>>
if (down_trylock(&open_semaphore))
3 309 /home/latest/xxx/drivers/watchdog/it8712f_wdt.c

             <<it8712f_wdt_open>>
             if (down_trylock(&it8712f_wdt_sem))
   4    214  /home/latest/xxx/drivers/watchdog/s3c2410_wdt.c
             <<s3c2410wdt_open>>
             if(down_trylock(&open_lock))

5 154 /home/latest/xxx/drivers/watchdog/sc1200wdt.c <<sc1200wdt_open>>
if (down_trylock(&open_sem))
6 95 /home/latest/xxx/drivers/watchdog/scx200_wdt.c <<scx200_wdt_open>>
if (down_trylock(&open_semaphore))
7 429 /home/latest/xxx/drivers/watchdog/wdt_pci.c <<wdtpci_open>>
if (down_trylock(&open_sem))

#2 lore raw
Quoted 7 lines · On Wed, 30 Jul 2008 13:27:36 +0200 Jiri Slaby <[email protected]> wrote:

Jiri Slaby napsal(a):

Quoted 2 lines

Maybe you already fixed this, in todays mmotm there is a fix of duplicate down_try definiton, but this problem still persist.

BTW. there is still bunch of down_trylock(); users, are you about to eliminate them?

Quoted 14 lines
    2    182  /home/latest/xxx/drivers/watchdog/ar7_wdt.c <<ar7_wdt_open>>
              if (down_trylock(&open_semaphore))
    3    309  /home/latest/xxx/drivers/watchdog/it8712f_wdt.c
              <<it8712f_wdt_open>>
              if (down_trylock(&it8712f_wdt_sem))
    4    214  /home/latest/xxx/drivers/watchdog/s3c2410_wdt.c
              <<s3c2410wdt_open>>
              if(down_trylock(&open_lock))
    5    154  /home/latest/xxx/drivers/watchdog/sc1200wdt.c <<sc1200wdt_open>>
              if (down_trylock(&open_sem))
    6     95  /home/latest/xxx/drivers/watchdog/scx200_wdt.c <<scx200_wdt_open>>
              if (down_trylock(&open_semaphore))
    7    429  /home/latest/xxx/drivers/watchdog/wdt_pci.c <<wdtpci_open>>
              if (down_trylock(&open_sem))

oh crap, yes, sorry, I had a bit of a catastrophe with two different versions of the sameish thing coming from two directions and my approach to fixing that was to drop one patch and to await the next linux-next pull for the other. Forgot.