[PATCH] collapse sv_init, init_sv on linux

[PATCH] collapse sv_init, init_sv on linux

[sandeen]

Change the one caller of init_sv on linux2.4 to sv_init, since there
is no difference between sv_init & init_sv on linux anyway.

Then get rid of now unused init_sv.

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

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

Index: xfs-linux/linux-2.4/sv.h
===================================================================
--- xfs-linux.orig/linux-2.4/sv.h
+++ xfs-linux/linux-2.4/sv.h
@@ -53,8 +53,6 @@ static inline void _sv_wait(sv_t *sv, sp
 	remove_wait_queue(&sv->waiters, &wait);
 }
 
-#define init_sv(sv,type,name,flag) \
-	init_waitqueue_head(&(sv)->waiters)
 #define sv_init(sv,flag,name) \
 	init_waitqueue_head(&(sv)->waiters)
 #define sv_destroy(sv) \
Index: xfs-linux/linux-2.4/xfs_vnode.c
===================================================================
--- xfs-linux.orig/linux-2.4/xfs_vnode.c
+++ xfs-linux/linux-2.4/xfs_vnode.c
@@ -35,7 +35,7 @@ vn_init(void)
 	register int i;
 
 	for (svp = vsync, i = 0; i < NVSYNC; i++, svp++)
-		init_sv(svp, SV_DEFAULT, "vsy", i);
+		sv_init(svp, SV_DEFAULT, "vsy");
 }
 
 struct bhv_vnode *
Index: xfs-linux/linux-2.6/sv.h
===================================================================
--- xfs-linux.orig/linux-2.6/sv.h
+++ xfs-linux/linux-2.6/sv.h
@@ -53,8 +53,6 @@ static inline void _sv_wait(sv_t *sv, sp
 	remove_wait_queue(&sv->waiters, &wait);
 }
 
-#define init_sv(sv,type,name,flag) \
-	init_waitqueue_head(&(sv)->waiters)
 #define sv_init(sv,flag,name) \
 	init_waitqueue_head(&(sv)->waiters)
 #define sv_destroy(sv) \

Re: [PATCH] collapse sv_init, init_sv on linux

[Nathan Scott]

On Thu, Aug 24, 2006 at 09:23:52PM -0500, sandeen@sandeen.net wrote:
> Change the one caller of init_sv on linux2.4 to sv_init, since there
> is no difference between sv_init & init_sv on linux anyway.
> 
> Then get rid of now unused init_sv.

Taa, queued up (along with one or two earlier ones I didn't
reply to yet).

thanks.

-- 
Nathan