standardize on one sema init macro

PATCH New [email protected] 1 participant 1 message Aug 23, 2006

lore

Share & tools

lore

[email protected]

author

2006-08-23 03:48 UTC #0 lore raw

PATCH 1/1 standardize on one sema init macro

One sema to rule them all, one sema to find them...

how many sema init routines does one really need after all?

Signed-off-by Eric Sandeen <[email protected]>

 linux-2.4/sema.h |    2 --
 linux-2.6/sema.h |    2 --
 xfs_iget.c       |    2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

linux-2.4/sema.h +0 -2

Index: xfs-linux/linux-2.4/sema.h
===================================================================
@@ -29,8 +29,6 @@
 
 typedef struct semaphore sema_t;
 
-#define init_sema(sp, val, c, d)	sema_init(sp, val)
-#define initsema(sp, val)		sema_init(sp, val)
 #define initnsema(sp, val, name)	sema_init(sp, val)
 #define psema(sp, b)			down(sp)
 #define vsema(sp)			up(sp)

linux-2.6/sema.h +0 -2

Index: xfs-linux/linux-2.6/sema.h
===================================================================
@@ -29,8 +29,6 @@
 
 typedef struct semaphore sema_t;
 
-#define init_sema(sp, val, c, d)	sema_init(sp, val)
-#define initsema(sp, val)		sema_init(sp, val)
 #define initnsema(sp, val, name)	sema_init(sp, val)
 #define psema(sp, b)			down(sp)
 #define vsema(sp)			up(sp)

xfs_iget.c +1 -1

Index: xfs-linux/xfs_iget.c
===================================================================
@@ -546,7 +546,7 @@ xfs_inode_lock_init(
 	mrlock_init(&ip->i_iolock, MRLOCK_BARRIER, "xfsio", vp->v_number);
 	init_waitqueue_head(&ip->i_ipin_wait);
 	atomic_set(&ip->i_pincount, 0);
-	init_sema(&ip->i_flock, 1, "xfsfino", vp->v_number);
+	initnsema(&ip->i_flock, 1, "xfsfino");
 }
 
 /*