yaffsfs.c: Fix NULL dereference in yaffs_unmount2_reldev()

[yaffs2.git] / yaffs_verify.c

diff --git a/yaffs_verify.c b/yaffs_verify.c
index 7a341a283079f0d98a84f566f4d86fac3193a8fd..e634b50d1944f1ac13eef1f0fc9c42aec945a088 100644 (file)
--- a/yaffs_verify.c
+++ b/yaffs_verify.c
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2011 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -37,16 +36,16 @@ static int yaffs_skip_nand_verification(struct yaffs_dev *dev)
 }
 
 static const char * const block_state_name[] = {
-       "Unknown",
-       "Needs scan",
-       "Scanning",
-       "Empty",
-       "Allocating",
-       "Full",
-       "Dirty",
-       "Checkpoint",
-       "Collecting",
-       "Dead"
+       [YAFFS_BLOCK_STATE_UNKNOWN] = "Unknown",
+       [YAFFS_BLOCK_STATE_NEEDS_SCAN] = "Needs scan",
+       [YAFFS_BLOCK_STATE_SCANNING] = "Scanning",
+       [YAFFS_BLOCK_STATE_EMPTY] = "Empty",
+       [YAFFS_BLOCK_STATE_ALLOCATING] = "Allocating",
+       [YAFFS_BLOCK_STATE_FULL] = "Full",
+       [YAFFS_BLOCK_STATE_DIRTY] = "Dirty",
+       [YAFFS_BLOCK_STATE_CHECKPOINT] = "Checkpoint",
+       [YAFFS_BLOCK_STATE_COLLECTING] = "Collecting",
+       [YAFFS_BLOCK_STATE_DEAD] = "Dead"
 };
 
 void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi, int n)
@@ -54,6 +53,8 @@ void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi, int n)
        int actually_used;
        int in_use;
 
+       (void) block_state_name;
+
        if (yaffs_skip_verification(dev))
                return;