Skip to content

Commit

Permalink
[XFS] standardize on one sema init macro
Browse files Browse the repository at this point in the history 
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: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
  • Loading branch information
Eric Sandeen authored and Tim Shimmin committed Sep 28, 2006
1 parent 91d8723 commit 7ae67d7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions fs/xfs/linux-2.6/sema.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion fs/xfs/xfs_iget.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

/*
Expand Down

0 comments on commit 7ae67d7

Please sign in to comment.