diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-30 18:53:12 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-30 18:53:12 +0000 |
| commit | 1802137ccbb542b6dcf4221c76f277821a8374c3 (patch) | |
| tree | 89575a2298e403e3b340a2c98caf793fc92119e9 /target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h | |
| parent | dfe9e683b0c294ac7c1ab0198d952331aa08e1bc (diff) | |
| download | openwrt-1802137ccbb542b6dcf4221c76f277821a8374c3.tar.gz openwrt-1802137ccbb542b6dcf4221c76f277821a8374c3.zip | |
AA: generic: fold yaffs_git_2010_10_20 patch to generic/files
Backport of r34013.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34018 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h')
| -rw-r--r-- | target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h b/target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h index 5b0a1ac24..432441bb8 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 <charles@aleph1.co.uk> @@ -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 |