Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7ae67d78e7518fba89e5f3a74bdcb68e48ae8858

Authored by Eric Sandeen
Committed by Tim Shimmin
1 parent 91d8723204
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

Showing 2 changed files with 1 additions and 3 deletions Side-by-side Diff

fs/xfs/linux-2.6/sema.h
Diff comments   View file @ 7ae67d7
... ... @@ -29,8 +29,6 @@
29 29  
30 30 typedef struct semaphore sema_t;
31 31  
32   -#define init_sema(sp, val, c, d) sema_init(sp, val)
33   -#define initsema(sp, val) sema_init(sp, val)
34 32 #define initnsema(sp, val, name) sema_init(sp, val)
35 33 #define psema(sp, b) down(sp)
36 34 #define vsema(sp) up(sp)
... ... @@ -546,7 +546,7 @@
546 546 mrlock_init(&ip->i_iolock, MRLOCK_BARRIER, "xfsio", vp->v_number);
547 547 init_waitqueue_head(&ip->i_ipin_wait);
548 548 atomic_set(&ip->i_pincount, 0);
549   - init_sema(&ip->i_flock, 1, "xfsfino", vp->v_number);
  549 + initnsema(&ip->i_flock, 1, "xfsfino");
550 550 }
551 551  
552 552 /*