2 files changed, 1 insertions, 3 deletions

diff --git a/fs/xfs/linux-2.6/sema.h b/fs/xfs/linux-2.6/sema.h
index b25090094cca..2009e6d922ce 100644
--- a/fs/xfs/linux-2.6/sema.h
+++ b/fs/xfs/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)
diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c
index e304ab078273..9b9379792f37 100644
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/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");
 }
 
 /*