yaffsfs.c: Fix NULL dereference in yaffs_unmount2_reldev()

[yaffs2.git] / yaffs_getblockinfo.h

diff --git a/yaffs_getblockinfo.h b/yaffs_getblockinfo.h
index 71fe1deea3c602c64ad78f4f6283decfbf1ae228..e84ccf8812dbafaba8bb27e50211c0504d02f252 100644 (file)
--- a/yaffs_getblockinfo.h
+++ b/yaffs_getblockinfo.h
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 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>
  *
@@ -20,16 +19,17 @@
 #include "yaffs_trace.h"
 
 /* Function to manipulate block info */
-static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
+static inline struct yaffs_block_info *yaffs_get_block_info(struct yaffs_dev
+                                                             *dev, int blk)
 {
-       if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-               T(YAFFS_TRACE_ERROR,
-                 (TSTR
-                  ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
-                  blk));
-               YBUG();
+       if (blk < (int)dev->internal_start_block ||
+           blk > (int)dev->internal_end_block) {
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "**>> yaffs: get_block_info block %d is not valid",
+                       blk);
+               BUG();
        }
-       return &dev->blockInfo[blk - dev->internalStartBlock];
+       return &dev->block_info[blk - dev->internal_start_block];
 }
 
 #endif