diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-07 17:14:22 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-07 17:14:22 +0000 |
commit | 65e4e12512261fc8fb1d4a8b39654d973da3dfce (patch) | |
tree | 1f3ed1973095f28937a063c462753354ad88c681 | |
parent | c3347ecaa8b85e2f39bedf2494f14b4dbcb7776e (diff) | |
download | upstream-65e4e12512261fc8fb1d4a8b39654d973da3dfce.tar.gz upstream-65e4e12512261fc8fb1d4a8b39654d973da3dfce.tar.bz2 upstream-65e4e12512261fc8fb1d4a8b39654d973da3dfce.zip |
[kernel] generic-2.6: refresh yaffs patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11397 3c298f89-4303-0410-b956-a3cf2f4a3e73
5 files changed, 22 insertions, 22 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.23/511-yaffs_reduce_compiler_warnings.patch b/target/linux/generic-2.6/patches-2.6.23/511-yaffs_reduce_compiler_warnings.patch index 61d0a7552c..118cb67c37 100644 --- a/target/linux/generic-2.6/patches-2.6.23/511-yaffs_reduce_compiler_warnings.patch +++ b/target/linux/generic-2.6/patches-2.6.23/511-yaffs_reduce_compiler_warnings.patch @@ -1,6 +1,6 @@ --- a/fs/yaffs2/yaffs_fs.c +++ b/fs/yaffs2/yaffs_fs.c -@@ -969,7 +970,7 @@ +@@ -969,7 +969,7 @@ 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 @@ +@@ -1273,7 +1273,7 @@ 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 @@ +@@ -1529,7 +1529,7 @@ 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 @@ +@@ -1864,7 +1864,7 @@ dev->skipCheckpointWrite = options.skip_checkpoint_write; /* we assume this is protected by lock_kernel() in mount/umount */ diff --git a/target/linux/generic-2.6/patches-2.6.25/511-yaffs_reduce_compiler_warnings.patch b/target/linux/generic-2.6/patches-2.6.25/511-yaffs_reduce_compiler_warnings.patch index 61d0a7552c..118cb67c37 100644 --- a/target/linux/generic-2.6/patches-2.6.25/511-yaffs_reduce_compiler_warnings.patch +++ b/target/linux/generic-2.6/patches-2.6.25/511-yaffs_reduce_compiler_warnings.patch @@ -1,6 +1,6 @@ --- a/fs/yaffs2/yaffs_fs.c +++ b/fs/yaffs2/yaffs_fs.c -@@ -969,7 +970,7 @@ +@@ -969,7 +969,7 @@ 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 @@ +@@ -1273,7 +1273,7 @@ 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 @@ +@@ -1529,7 +1529,7 @@ 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 @@ +@@ -1864,7 +1864,7 @@ dev->skipCheckpointWrite = options.skip_checkpoint_write; /* we assume this is protected by lock_kernel() in mount/umount */ diff --git a/target/linux/generic-2.6/patches-2.6.25/512-yaffs_2.6.25_fix.patch b/target/linux/generic-2.6/patches-2.6.25/512-yaffs_2.6.25_fix.patch index ac895342f6..b0555789f3 100644 --- a/target/linux/generic-2.6/patches-2.6.25/512-yaffs_2.6.25_fix.patch +++ b/target/linux/generic-2.6/patches-2.6.25/512-yaffs_2.6.25_fix.patch @@ -1,6 +1,6 @@ --- a/fs/yaffs2/yaffs_fs.c +++ b/fs/yaffs2/yaffs_fs.c -@@ -181,7 +181,13 @@ +@@ -183,7 +183,13 @@ #else static int yaffs_statfs(struct super_block *sb, struct statfs *buf); #endif @@ -14,7 +14,7 @@ static void yaffs_put_inode(struct inode *inode); static void yaffs_delete_inode(struct inode *); -@@ -284,7 +290,9 @@ +@@ -286,7 +292,9 @@ static struct super_operations yaffs_super_ops = { .statfs = yaffs_statfs, @@ -24,7 +24,7 @@ .put_inode = yaffs_put_inode, .put_super = yaffs_put_super, .delete_inode = yaffs_delete_inode, -@@ -844,11 +852,17 @@ +@@ -848,11 +856,17 @@ T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId)); @@ -42,7 +42,7 @@ return inode; } -@@ -1427,6 +1441,39 @@ +@@ -1453,6 +1467,39 @@ } @@ -82,7 +82,7 @@ static void yaffs_read_inode(struct inode *inode) { /* NB This is called as a side effect of other functions, but -@@ -1448,6 +1495,7 @@ +@@ -1474,6 +1521,7 @@ yaffs_GrossUnlock(dev); } diff --git a/target/linux/generic-2.6/patches-2.6.26/511-yaffs_reduce_compiler_warnings.patch b/target/linux/generic-2.6/patches-2.6.26/511-yaffs_reduce_compiler_warnings.patch index 61d0a7552c..118cb67c37 100644 --- a/target/linux/generic-2.6/patches-2.6.26/511-yaffs_reduce_compiler_warnings.patch +++ b/target/linux/generic-2.6/patches-2.6.26/511-yaffs_reduce_compiler_warnings.patch @@ -1,6 +1,6 @@ --- a/fs/yaffs2/yaffs_fs.c +++ b/fs/yaffs2/yaffs_fs.c -@@ -969,7 +970,7 @@ +@@ -969,7 +969,7 @@ 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 @@ +@@ -1273,7 +1273,7 @@ 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 @@ +@@ -1529,7 +1529,7 @@ 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 @@ +@@ -1864,7 +1864,7 @@ dev->skipCheckpointWrite = options.skip_checkpoint_write; /* we assume this is protected by lock_kernel() in mount/umount */ diff --git a/target/linux/generic-2.6/patches-2.6.26/512-yaffs_2.6.25_fix.patch b/target/linux/generic-2.6/patches-2.6.26/512-yaffs_2.6.25_fix.patch index ac895342f6..b0555789f3 100644 --- a/target/linux/generic-2.6/patches-2.6.26/512-yaffs_2.6.25_fix.patch +++ b/target/linux/generic-2.6/patches-2.6.26/512-yaffs_2.6.25_fix.patch @@ -1,6 +1,6 @@ --- a/fs/yaffs2/yaffs_fs.c +++ b/fs/yaffs2/yaffs_fs.c -@@ -181,7 +181,13 @@ +@@ -183,7 +183,13 @@ #else static int yaffs_statfs(struct super_block *sb, struct statfs *buf); #endif @@ -14,7 +14,7 @@ static void yaffs_put_inode(struct inode *inode); static void yaffs_delete_inode(struct inode *); -@@ -284,7 +290,9 @@ +@@ -286,7 +292,9 @@ static struct super_operations yaffs_super_ops = { .statfs = yaffs_statfs, @@ -24,7 +24,7 @@ .put_inode = yaffs_put_inode, .put_super = yaffs_put_super, .delete_inode = yaffs_delete_inode, -@@ -844,11 +852,17 @@ +@@ -848,11 +856,17 @@ T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId)); @@ -42,7 +42,7 @@ return inode; } -@@ -1427,6 +1441,39 @@ +@@ -1453,6 +1467,39 @@ } @@ -82,7 +82,7 @@ static void yaffs_read_inode(struct inode *inode) { /* NB This is called as a side effect of other functions, but -@@ -1448,6 +1495,7 @@ +@@ -1474,6 +1521,7 @@ yaffs_GrossUnlock(dev); } |