From 449f88df0f02fea3a7206d44daf62a553f9e819e Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 30 Oct 2012 14:58:17 +0000 Subject: generic: fold yaffs_git_2010_10_20 patch to generic/files Signed-off-by: Gabor Juhos SVN-Revision: 34013 --- target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h') diff --git a/target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h b/target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h index 5b0a1ac..432441b 100644 --- a/target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h +++ b/target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h @@ -1,7 +1,7 @@ /* * YAFFS: Yet another Flash File System . A NAND-flash specific file system. * - * Copyright (C) 2002-2007 Aleph One Ltd. + * Copyright (C) 2002-2010 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning @@ -17,18 +17,19 @@ #define __YAFFS_GETBLOCKINFO_H__ #include "yaffs_guts.h" +#include "yaffs_trace.h" /* Function to manipulate block info */ -static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk) +static Y_INLINE yaffs_block_info_t *yaffs_get_block_info(yaffs_dev_t * dev, int blk) { - if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) { + if (blk < dev->internal_start_block || blk > dev->internal_end_block) { T(YAFFS_TRACE_ERROR, (TSTR ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR), blk)); YBUG(); } - return &dev->blockInfo[blk - dev->internalStartBlock]; + return &dev->block_info[blk - dev->internal_start_block]; } #endif -- cgit v1.1