Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

[~andy/linux] / fs / jffs / jffs_fm.c

diff --git a/fs/jffs/jffs_fm.c b/fs/jffs/jffs_fm.c
index 6da13b309bd19b533f05b6a74b456f7e0e20c738..7d8ca1aeace2f85937384dba8b906fe4020d6de4 100644 (file)
--- a/fs/jffs/jffs_fm.c
+++ b/fs/jffs/jffs_fm.c
@@ -139,7 +139,7 @@ jffs_build_begin(struct jffs_control *c, int unit)
        fmc->tail = NULL;
        fmc->head_extra = NULL;
        fmc->tail_extra = NULL;
-       init_MUTEX(&fmc->biglock);
+       mutex_init(&fmc->biglock);
        return fmc;
 }