mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[kernel] generic-2.6/2.6.21: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14453 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/fs/yaffs2/yaffs_fs.c
|
||||
+++ b/fs/yaffs2/yaffs_fs.c
|
||||
@@ -969,7 +970,7 @@
|
||||
@@ -965,7 +965,7 @@ static int yaffs_readdir(struct file *f,
|
||||
f->f_version = inode->i_version;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
curoffs++;
|
||||
if (curoffs >= offset) {
|
||||
l = list_entry(i, yaffs_Object, siblings);
|
||||
@@ -1273,7 +1275,7 @@
|
||||
@@ -1269,7 +1269,7 @@ static int yaffs_rename(struct inode *ol
|
||||
|
||||
if (target &&
|
||||
target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
|
||||
|
||||
@@ -1529,7 +1531,7 @@
|
||||
@@ -1503,7 +1503,7 @@ static void yaffs_put_super(struct super
|
||||
yaffs_GrossUnlock(dev);
|
||||
|
||||
/* we assume this is protected by lock_kernel() in mount/umount */
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
if(dev->spareBuffer){
|
||||
YFREE(dev->spareBuffer);
|
||||
@@ -1864,7 +1866,7 @@
|
||||
@@ -1847,7 +1847,7 @@ static struct super_block *yaffs_interna
|
||||
dev->skipCheckpointWrite = options.skip_checkpoint_write;
|
||||
|
||||
/* we assume this is protected by lock_kernel() in mount/umount */
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
--- a/fs/yaffs2/yaffs_mtdif1.c
|
||||
+++ b/fs/yaffs2/yaffs_mtdif1.c
|
||||
@@ -323,7 +323,7 @@
|
||||
@@ -323,7 +323,7 @@ static int nandmtd1_TestPrerequists(stru
|
||||
* Always returns YAFFS_OK.
|
||||
*/
|
||||
int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
|
||||
@@ -49,7 +49,7 @@
|
||||
int chunkNo = blockNo * dev->nChunksPerBlock;
|
||||
--- a/fs/yaffs2/yaffs_mtdif1.h
|
||||
+++ b/fs/yaffs2/yaffs_mtdif1.h
|
||||
@@ -23,6 +23,6 @@
|
||||
@@ -23,6 +23,6 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
|
||||
int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
|
||||
|
||||
int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
|
||||
@@ -59,7 +59,7 @@
|
||||
#endif
|
||||
--- a/fs/yaffs2/yaffs_mtdif2.c
|
||||
+++ b/fs/yaffs2/yaffs_mtdif2.c
|
||||
@@ -204,7 +204,7 @@
|
||||
@@ -188,7 +188,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
|
||||
}
|
||||
|
||||
int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
|
||||
@@ -70,7 +70,7 @@
|
||||
int retval;
|
||||
--- a/fs/yaffs2/yaffs_mtdif2.h
|
||||
+++ b/fs/yaffs2/yaffs_mtdif2.h
|
||||
@@ -24,6 +24,6 @@
|
||||
@@ -24,6 +24,6 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
|
||||
__u8 * data, yaffs_ExtendedTags * tags);
|
||||
int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
|
||||
int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
|
||||
|
||||
Reference in New Issue
Block a user