Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ae67d78 authored by Eric Sandeen's avatar Eric Sandeen Committed by Tim Shimmin
Browse files

[XFS] standardize on one sema init macro 



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

SGI-PV: 907752
SGI-Modid: xfs-linux-melb:xfs-kern:26911a

Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 91d87232

fs/xfs/linux-2.6/sema.h

+0 −2
Original line number Diff line number Diff line
@@ -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)

fs/xfs/xfs_iget.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

}



/*