mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-03-04 04:31:08 +00:00
generic-2.6: refresh yaffs patches
SVN-Revision: 11397
This commit is contained in:
parent
93441174d6
commit
116a3864ad
@ -1,6 +1,6 @@
|
|||||||
--- a/fs/yaffs2/yaffs_fs.c
|
--- a/fs/yaffs2/yaffs_fs.c
|
||||||
+++ b/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;
|
f->f_version = inode->i_version;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
curoffs++;
|
curoffs++;
|
||||||
if (curoffs >= offset) {
|
if (curoffs >= offset) {
|
||||||
l = list_entry(i, yaffs_Object, siblings);
|
l = list_entry(i, yaffs_Object, siblings);
|
||||||
@@ -1273,7 +1275,7 @@
|
@@ -1273,7 +1273,7 @@
|
||||||
|
|
||||||
if (target &&
|
if (target &&
|
||||||
target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
|
target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
|
||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
|
T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
|
||||||
|
|
||||||
@@ -1529,7 +1531,7 @@
|
@@ -1529,7 +1529,7 @@
|
||||||
yaffs_GrossUnlock(dev);
|
yaffs_GrossUnlock(dev);
|
||||||
|
|
||||||
/* we assume this is protected by lock_kernel() in mount/umount */
|
/* we assume this is protected by lock_kernel() in mount/umount */
|
||||||
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
if(dev->spareBuffer){
|
if(dev->spareBuffer){
|
||||||
YFREE(dev->spareBuffer);
|
YFREE(dev->spareBuffer);
|
||||||
@@ -1864,7 +1866,7 @@
|
@@ -1864,7 +1864,7 @@
|
||||||
dev->skipCheckpointWrite = options.skip_checkpoint_write;
|
dev->skipCheckpointWrite = options.skip_checkpoint_write;
|
||||||
|
|
||||||
/* we assume this is protected by lock_kernel() in mount/umount */
|
/* we assume this is protected by lock_kernel() in mount/umount */
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/fs/yaffs2/yaffs_fs.c
|
--- a/fs/yaffs2/yaffs_fs.c
|
||||||
+++ b/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;
|
f->f_version = inode->i_version;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
curoffs++;
|
curoffs++;
|
||||||
if (curoffs >= offset) {
|
if (curoffs >= offset) {
|
||||||
l = list_entry(i, yaffs_Object, siblings);
|
l = list_entry(i, yaffs_Object, siblings);
|
||||||
@@ -1273,7 +1275,7 @@
|
@@ -1273,7 +1273,7 @@
|
||||||
|
|
||||||
if (target &&
|
if (target &&
|
||||||
target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
|
target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
|
||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
|
T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
|
||||||
|
|
||||||
@@ -1529,7 +1531,7 @@
|
@@ -1529,7 +1529,7 @@
|
||||||
yaffs_GrossUnlock(dev);
|
yaffs_GrossUnlock(dev);
|
||||||
|
|
||||||
/* we assume this is protected by lock_kernel() in mount/umount */
|
/* we assume this is protected by lock_kernel() in mount/umount */
|
||||||
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
if(dev->spareBuffer){
|
if(dev->spareBuffer){
|
||||||
YFREE(dev->spareBuffer);
|
YFREE(dev->spareBuffer);
|
||||||
@@ -1864,7 +1866,7 @@
|
@@ -1864,7 +1864,7 @@
|
||||||
dev->skipCheckpointWrite = options.skip_checkpoint_write;
|
dev->skipCheckpointWrite = options.skip_checkpoint_write;
|
||||||
|
|
||||||
/* we assume this is protected by lock_kernel() in mount/umount */
|
/* we assume this is protected by lock_kernel() in mount/umount */
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/fs/yaffs2/yaffs_fs.c
|
--- a/fs/yaffs2/yaffs_fs.c
|
||||||
+++ b/fs/yaffs2/yaffs_fs.c
|
+++ b/fs/yaffs2/yaffs_fs.c
|
||||||
@@ -181,7 +181,13 @@
|
@@ -183,7 +183,13 @@
|
||||||
#else
|
#else
|
||||||
static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
|
static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
|
||||||
#endif
|
#endif
|
||||||
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
static void yaffs_put_inode(struct inode *inode);
|
static void yaffs_put_inode(struct inode *inode);
|
||||||
static void yaffs_delete_inode(struct inode *);
|
static void yaffs_delete_inode(struct inode *);
|
||||||
@@ -284,7 +290,9 @@
|
@@ -286,7 +292,9 @@
|
||||||
|
|
||||||
static struct super_operations yaffs_super_ops = {
|
static struct super_operations yaffs_super_ops = {
|
||||||
.statfs = yaffs_statfs,
|
.statfs = yaffs_statfs,
|
||||||
@ -24,7 +24,7 @@
|
|||||||
.put_inode = yaffs_put_inode,
|
.put_inode = yaffs_put_inode,
|
||||||
.put_super = yaffs_put_super,
|
.put_super = yaffs_put_super,
|
||||||
.delete_inode = yaffs_delete_inode,
|
.delete_inode = yaffs_delete_inode,
|
||||||
@@ -844,11 +852,17 @@
|
@@ -848,11 +856,17 @@
|
||||||
T(YAFFS_TRACE_OS,
|
T(YAFFS_TRACE_OS,
|
||||||
(KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
|
(KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
|
||||||
|
|
||||||
@ -42,7 +42,7 @@
|
|||||||
|
|
||||||
return inode;
|
return inode;
|
||||||
}
|
}
|
||||||
@@ -1427,6 +1441,39 @@
|
@@ -1453,6 +1467,39 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -82,7 +82,7 @@
|
|||||||
static void yaffs_read_inode(struct inode *inode)
|
static void yaffs_read_inode(struct inode *inode)
|
||||||
{
|
{
|
||||||
/* NB This is called as a side effect of other functions, but
|
/* NB This is called as a side effect of other functions, but
|
||||||
@@ -1448,6 +1495,7 @@
|
@@ -1474,6 +1521,7 @@
|
||||||
|
|
||||||
yaffs_GrossUnlock(dev);
|
yaffs_GrossUnlock(dev);
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/fs/yaffs2/yaffs_fs.c
|
--- a/fs/yaffs2/yaffs_fs.c
|
||||||
+++ b/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;
|
f->f_version = inode->i_version;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
curoffs++;
|
curoffs++;
|
||||||
if (curoffs >= offset) {
|
if (curoffs >= offset) {
|
||||||
l = list_entry(i, yaffs_Object, siblings);
|
l = list_entry(i, yaffs_Object, siblings);
|
||||||
@@ -1273,7 +1275,7 @@
|
@@ -1273,7 +1273,7 @@
|
||||||
|
|
||||||
if (target &&
|
if (target &&
|
||||||
target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
|
target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
|
||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
|
T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
|
||||||
|
|
||||||
@@ -1529,7 +1531,7 @@
|
@@ -1529,7 +1529,7 @@
|
||||||
yaffs_GrossUnlock(dev);
|
yaffs_GrossUnlock(dev);
|
||||||
|
|
||||||
/* we assume this is protected by lock_kernel() in mount/umount */
|
/* we assume this is protected by lock_kernel() in mount/umount */
|
||||||
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
if(dev->spareBuffer){
|
if(dev->spareBuffer){
|
||||||
YFREE(dev->spareBuffer);
|
YFREE(dev->spareBuffer);
|
||||||
@@ -1864,7 +1866,7 @@
|
@@ -1864,7 +1864,7 @@
|
||||||
dev->skipCheckpointWrite = options.skip_checkpoint_write;
|
dev->skipCheckpointWrite = options.skip_checkpoint_write;
|
||||||
|
|
||||||
/* we assume this is protected by lock_kernel() in mount/umount */
|
/* we assume this is protected by lock_kernel() in mount/umount */
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/fs/yaffs2/yaffs_fs.c
|
--- a/fs/yaffs2/yaffs_fs.c
|
||||||
+++ b/fs/yaffs2/yaffs_fs.c
|
+++ b/fs/yaffs2/yaffs_fs.c
|
||||||
@@ -181,7 +181,13 @@
|
@@ -183,7 +183,13 @@
|
||||||
#else
|
#else
|
||||||
static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
|
static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
|
||||||
#endif
|
#endif
|
||||||
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
static void yaffs_put_inode(struct inode *inode);
|
static void yaffs_put_inode(struct inode *inode);
|
||||||
static void yaffs_delete_inode(struct inode *);
|
static void yaffs_delete_inode(struct inode *);
|
||||||
@@ -284,7 +290,9 @@
|
@@ -286,7 +292,9 @@
|
||||||
|
|
||||||
static struct super_operations yaffs_super_ops = {
|
static struct super_operations yaffs_super_ops = {
|
||||||
.statfs = yaffs_statfs,
|
.statfs = yaffs_statfs,
|
||||||
@ -24,7 +24,7 @@
|
|||||||
.put_inode = yaffs_put_inode,
|
.put_inode = yaffs_put_inode,
|
||||||
.put_super = yaffs_put_super,
|
.put_super = yaffs_put_super,
|
||||||
.delete_inode = yaffs_delete_inode,
|
.delete_inode = yaffs_delete_inode,
|
||||||
@@ -844,11 +852,17 @@
|
@@ -848,11 +856,17 @@
|
||||||
T(YAFFS_TRACE_OS,
|
T(YAFFS_TRACE_OS,
|
||||||
(KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
|
(KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
|
||||||
|
|
||||||
@ -42,7 +42,7 @@
|
|||||||
|
|
||||||
return inode;
|
return inode;
|
||||||
}
|
}
|
||||||
@@ -1427,6 +1441,39 @@
|
@@ -1453,6 +1467,39 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -82,7 +82,7 @@
|
|||||||
static void yaffs_read_inode(struct inode *inode)
|
static void yaffs_read_inode(struct inode *inode)
|
||||||
{
|
{
|
||||||
/* NB This is called as a side effect of other functions, but
|
/* NB This is called as a side effect of other functions, but
|
||||||
@@ -1448,6 +1495,7 @@
|
@@ -1474,6 +1521,7 @@
|
||||||
|
|
||||||
yaffs_GrossUnlock(dev);
|
yaffs_GrossUnlock(dev);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user