mtd/fs/jffs2/ecos/src dir-ecos.c, 1.12, 1.13 fs-ecos.c, 1.45,
1.46 gcthread.c, 1.3, 1.4 malloc-ecos.c, 1.4, 1.5 os-ecos.h,
1.26, 1.27
gleixner at infradead.org
gleixner at infradead.org
Mon Nov 7 06:15:58 EST 2005
- Previous message: mtd/util/checkfs Makefile, 1.1, 1.2 checkfs.c, 1.7, 1.8 comm.c, 1.2,
1.3 makefiles.c, 1.1, 1.2
- Next message: mtd/fs/jffs inode-v22.c, 1.67, 1.68 inode-v23.c, 1.74, 1.75 intrep.c,
1.105, 1.106 intrep.h, 1.14, 1.15 jffs_fm.c, 1.31,
1.32 jffs_proc.c, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/mtd/fs/jffs2/ecos/src
In directory phoenix.infradead.org:/tmp/cvs-serv29274/fs/jffs2/ecos/src
Modified Files:
dir-ecos.c fs-ecos.c gcthread.c malloc-ecos.c os-ecos.h
Log Message:
[MTD / JFFS2] Clean up trailing white spaces
Index: dir-ecos.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/ecos/src/dir-ecos.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dir-ecos.c 30 Jul 2005 15:25:45 -0000 1.12
+++ dir-ecos.c 7 Nov 2005 11:14:43 -0000 1.13
@@ -36,7 +36,7 @@
/* NB: The 2.2 backport will need to explicitly check for '.' and '..' here */
for (fd_list = dir_f->dents; fd_list && fd_list->nhash <= hash; fd_list = fd_list->next) {
- if (fd_list->nhash == hash &&
+ if (fd_list->nhash == hash &&
(!fd || fd_list->version > fd->version) &&
strlen((char *)fd_list->name) == namelen &&
!strncmp((char *)fd_list->name, (char *)d_name, namelen)) {
@@ -73,7 +73,7 @@
ri = jffs2_alloc_raw_inode();
if (!ri)
return -ENOMEM;
-
+
c = JFFS2_SB_INFO(dir_i->i_sb);
D1(printk(KERN_DEBUG "jffs2_create()\n"));
@@ -89,8 +89,8 @@
f = JFFS2_INODE_INFO(inode);
dir_f = JFFS2_INODE_INFO(dir_i);
- ret = jffs2_do_create(c, dir_f, f, ri,
- (const char *)d_name,
+ ret = jffs2_do_create(c, dir_f, f, ri,
+ (const char *)d_name,
strlen((char *)d_name));
if (ret) {
@@ -118,7 +118,7 @@
struct jffs2_inode_info *dead_f = JFFS2_INODE_INFO(d_inode);
int ret;
- ret = jffs2_do_unlink(c, dir_f, (const char *)d_name,
+ ret = jffs2_do_unlink(c, dir_f, (const char *)d_name,
strlen((char *)d_name), dead_f);
if (dead_f->inocache)
d_inode->i_nlink = dead_f->inocache->nlink;
@@ -138,8 +138,8 @@
uint8_t type = (old_d_inode->i_mode & S_IFMT) >> 12;
if (!type) type = DT_REG;
- ret = jffs2_do_link(c, dir_f, f->inocache->ino, type,
- (const char * )d_name,
+ ret = jffs2_do_link(c, dir_f, f->inocache->ino, type,
+ (const char * )d_name,
strlen((char *)d_name));
if (!ret) {
@@ -168,11 +168,11 @@
ri = jffs2_alloc_raw_inode();
if (!ri)
return -ENOMEM;
-
+
c = JFFS2_SB_INFO(dir_i->i_sb);
- /* Try to reserve enough space for both node and dirent.
- * Just the node will do for now, though
+ /* Try to reserve enough space for both node and dirent.
+ * Just the node will do for now, though
*/
namelen = strlen((char *)d_name);
ret = jffs2_reserve_space(c, sizeof(*ri), &phys_ofs, &alloclen, ALLOC_NORMAL);
@@ -194,7 +194,7 @@
ri->data_crc = cpu_to_je32(0);
ri->node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));
-
+
fn = jffs2_write_dnode(c, f, ri, NULL, 0, phys_ofs, ALLOC_NORMAL);
jffs2_free_raw_inode(ri);
@@ -207,7 +207,7 @@
jffs2_iput(inode);
return PTR_ERR(fn);
}
- /* No data here. Only a metadata node, which will be
+ /* No data here. Only a metadata node, which will be
obsoleted by the first data write
*/
f->metadata = fn;
@@ -221,7 +221,7 @@
jffs2_iput(inode);
return ret;
}
-
+
rd = jffs2_alloc_raw_dirent();
if (!rd) {
/* Argh. Now we treat it like a normal delete */
@@ -249,12 +249,12 @@
rd->name_crc = cpu_to_je32(crc32(0, d_name, namelen));
fd = jffs2_write_dirent(c, dir_f, rd, d_name, namelen, phys_ofs, ALLOC_NORMAL);
-
+
jffs2_complete_reservation(c);
jffs2_free_raw_dirent(rd);
-
+
if (IS_ERR(fd)) {
- /* dirent failed to write. Delete the inode normally
+ /* dirent failed to write. Delete the inode normally
as if it were the final unlink() */
up(&dir_f->sem);
inode->i_nlink = 0;
@@ -291,10 +291,10 @@
struct jffs2_inode_info *victim_f = NULL;
uint8_t type;
-#if 0 /* FIXME -- this really doesn't belong in individual file systems.
+#if 0 /* FIXME -- this really doesn't belong in individual file systems.
The fileio code ought to do this for us, or at least part of it */
if (new_dentry->d_inode) {
- if (S_ISDIR(d_inode->i_mode) &&
+ if (S_ISDIR(d_inode->i_mode) &&
!S_ISDIR(new_dentry->d_inode->i_mode)) {
/* Cannot rename directory over non-directory */
return -EINVAL;
@@ -322,19 +322,19 @@
#endif
/* XXX: We probably ought to alloc enough space for
- both nodes at the same time. Writing the new link,
+ both nodes at the same time. Writing the new link,
then getting -ENOSPC, is quite bad :)
*/
/* Make a hard link */
-
+
/* XXX: This is ugly */
type = (d_inode->i_mode & S_IFMT) >> 12;
if (!type) type = DT_REG;
- ret = jffs2_do_link(c, JFFS2_INODE_INFO(new_dir_i),
+ ret = jffs2_do_link(c, JFFS2_INODE_INFO(new_dir_i),
d_inode->i_ino, type,
- (const char *)new_d_name,
+ (const char *)new_d_name,
strlen((char *)new_d_name));
if (ret)
@@ -352,8 +352,8 @@
}
/* Unlink the original */
- ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
- (const char *)old_d_name,
+ ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
+ (const char *)old_d_name,
strlen((char *)old_d_name), NULL);
if (ret) {
Index: fs-ecos.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/ecos/src/fs-ecos.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- fs-ecos.c 30 Jul 2005 15:25:45 -0000 1.45
+++ fs-ecos.c 7 Nov 2005 11:14:43 -0000 1.46
@@ -190,7 +190,7 @@
restart:
D2(printf("icache_evict\n"));
// If this is an absolute search path from the root,
- // remove all cached inodes with i_count of zero (these are only
+ // remove all cached inodes with i_count of zero (these are only
// held where needed for dotdot filepaths)
while (this) {
next = this->i_cache_next;
@@ -254,7 +254,7 @@
if (!S_ISDIR(dir->i_mode))
return ENOTDIR;
- // Isolate the next element of the path name.
+ // Isolate the next element of the path name.
while (*n != '\0' && *n != '/')
n++, namelen++;
@@ -272,10 +272,10 @@
default:
break;
case 2:
- // Dot followed by not Dot, treat as any other name
+ // Dot followed by not Dot, treat as any other name
if (name[1] != '.')
break;
- // Dot Dot
+ // Dot Dot
// Move back up the search path
D2(printf("find_entry found ..\n"));
ds->dir = ds->node;
@@ -319,7 +319,7 @@
// Main interface to directory search code. This is used in all file
// level operations to locate the object named by the pathname.
-// Returns with use count incremented on both the sought object and
+// Returns with use count incremented on both the sought object and
// the directory it was found in
static int jffs2_find(jffs2_dirsearch * d)
{
@@ -542,7 +542,7 @@
memset(c->inocache_list, 0, sizeof(struct jffs2_inode_cache *) * INOCACHE_HASHSIZE);
if (n_fs_mounted++ == 0) {
jffs2_create_slab_caches(); // No error check, cannot fail
- jffs2_compressors_init();
+ jffs2_compressors_init();
}
err = jffs2_read_super(jffs2_sb);
@@ -552,7 +552,7 @@
jffs2_destroy_slab_caches();
jffs2_compressors_exit();
}
-
+
free(jffs2_sb);
free(c->inocache_list);
return err;
@@ -586,7 +586,7 @@
// -------------------------------------------------------------------------
// jffs2_umount()
-// Unmount the filesystem.
+// Unmount the filesystem.
static int jffs2_umount(cyg_mtab_entry * mte)
{
@@ -616,7 +616,7 @@
cyg_cdir_dir == (cyg_dir)root &&
!strcmp(mte->name, "/")) {
/* If we were mounted on root, there's no
- way for the cwd to change out and free
+ way for the cwd to change out and free
the file system for unmounting. So we hack
it -- if cwd is '/' we unset it. Perhaps
we should allow chdir(NULL) to unset
@@ -664,7 +664,7 @@
jffs2_sb->s_mount_count--;
}
if (--n_fs_mounted == 0) {
- jffs2_destroy_slab_caches();
+ jffs2_destroy_slab_caches();
jffs2_compressors_exit();
}
return ENOERR;
@@ -693,7 +693,7 @@
if (mode & (O_CREAT|O_TRUNC|O_WRONLY))
return EROFS;
#endif
- init_dirsearch(&ds, (struct _inode *) dir,
+ init_dirsearch(&ds, (struct _inode *) dir,
(const unsigned char *) name);
err = jffs2_find(&ds);
@@ -728,7 +728,7 @@
node = ds.node;
}
- // Finished with the directory now
+ // Finished with the directory now
jffs2_iput(ds.dir);
if (err != ENOERR)
@@ -753,7 +753,7 @@
return EROFS;
#endif
}
-
+
// Initialise the file object
file->f_flag |= mode & CYG_FILE_MODE_MASK;
file->f_type = CYG_FILE_TYPE_FILE;
@@ -777,7 +777,7 @@
D2(printf("jffs2_ops_unlink\n"));
- init_dirsearch(&ds, (struct _inode *) dir,
+ init_dirsearch(&ds, (struct _inode *) dir,
(const unsigned char *)name);
err = jffs2_find(&ds);
@@ -814,7 +814,7 @@
D2(printf("jffs2_ops_mkdir\n"));
- init_dirsearch(&ds, (struct _inode *) dir,
+ init_dirsearch(&ds, (struct _inode *) dir,
(const unsigned char *)name);
err = jffs2_find(&ds);
@@ -851,7 +851,7 @@
D2(printf("jffs2_ops_rmdir\n"));
- init_dirsearch(&ds, (struct _inode *) dir,
+ init_dirsearch(&ds, (struct _inode *) dir,
(const unsigned char *)name);
err = jffs2_find(&ds);
@@ -887,7 +887,7 @@
D2(printf("jffs2_ops_rename\n"));
- init_dirsearch(&ds1, (struct _inode *) dir1,
+ init_dirsearch(&ds1, (struct _inode *) dir1,
(const unsigned char *)name1);
err = jffs2_find(&ds1);
@@ -897,7 +897,7 @@
return err;
}
- init_dirsearch(&ds2, (struct _inode *) dir2,
+ init_dirsearch(&ds2, (struct _inode *) dir2,
(const unsigned char *)name2);
err = jffs2_find(&ds2);
@@ -969,7 +969,7 @@
jffs2_iput(ds1.node);
if (ds2.node)
jffs2_iput(ds2.node);
-
+
return err;
}
@@ -989,7 +989,7 @@
if (type != CYG_FSLINK_HARD)
return EINVAL;
- init_dirsearch(&ds1, (struct _inode *) dir1,
+ init_dirsearch(&ds1, (struct _inode *) dir1,
(const unsigned char *) name1);
err = jffs2_find(&ds1);
@@ -999,7 +999,7 @@
return err;
}
- init_dirsearch(&ds2, (struct _inode *) dir2,
+ init_dirsearch(&ds2, (struct _inode *) dir2,
(const unsigned char *) name2);
err = jffs2_find(&ds2);
@@ -1054,7 +1054,7 @@
D2(printf("jffs2_opendir\n"));
- init_dirsearch(&ds, (struct _inode *) dir,
+ init_dirsearch(&ds, (struct _inode *) dir,
(const unsigned char *) name);
err = jffs2_find(&ds);
@@ -1099,7 +1099,7 @@
jffs2_dirsearch ds;
int err;
- init_dirsearch(&ds, (struct _inode *) dir,
+ init_dirsearch(&ds, (struct _inode *) dir,
(const unsigned char *) name);
err = jffs2_find(&ds);
@@ -1113,7 +1113,7 @@
jffs2_iput(ds.node);
return ENOTDIR;
}
-
+
// Pass it out
*dir_out = (cyg_dir) ds.node;
} else {
@@ -1142,7 +1142,7 @@
D2(printf("jffs2_stat\n"));
- init_dirsearch(&ds, (struct _inode *) dir,
+ init_dirsearch(&ds, (struct _inode *) dir,
(const unsigned char *) name);
err = jffs2_find(&ds);
@@ -1180,7 +1180,7 @@
D2(printf("jffs2_getinfo\n"));
- init_dirsearch(&ds, (struct _inode *) dir,
+ init_dirsearch(&ds, (struct _inode *) dir,
(const unsigned char *) name);
err = jffs2_find(&ds);
@@ -1309,7 +1309,7 @@
ri->compr = JFFS2_COMPR_ZERO;
ri->node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));
ri->data_crc = cpu_to_je32(0);
-
+
fn = jffs2_write_dnode(c, f, ri, NULL, 0, phys_ofs, ALLOC_NORMAL);
jffs2_complete_reservation(c);
if (IS_ERR(fn)) {
@@ -1345,13 +1345,13 @@
struct jffs2_raw_inode *ri;
uint32_t phys_ofs, alloclen;
int err;
-
+
ri = jffs2_alloc_raw_inode();
if (!ri) {
return ENOMEM;
}
err = jffs2_reserve_space(c, sizeof(*ri), &phys_ofs, &alloclen, ALLOC_NORMAL);
-
+
if (err) {
jffs2_free_raw_inode(ri);
return err;
@@ -1361,10 +1361,10 @@
ri->nodetype = cpu_to_je16(JFFS2_NODETYPE_INODE);
ri->totlen = cpu_to_je32(sizeof(*ri));
ri->hdr_crc = cpu_to_je32(crc32(0, ri, sizeof(struct jffs2_unknown_node)-4));
-
+
ri->ino = cpu_to_je32(inode->i_ino);
ri->version = cpu_to_je32(++f->highest_version);
-
+
ri->uid = cpu_to_je16(inode->i_uid);
ri->gid = cpu_to_je16(inode->i_gid);
ri->mode = cpu_to_jemode(inode->i_mode);
@@ -1376,7 +1376,7 @@
ri->compr = JFFS2_COMPR_NONE;
ri->node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));
ri->data_crc = cpu_to_je32(0);
- new_metadata = jffs2_write_dnode(c, f, ri, NULL, 0,
+ new_metadata = jffs2_write_dnode(c, f, ri, NULL, 0,
phys_ofs, ALLOC_NORMAL);
if (IS_ERR(new_metadata)) {
jffs2_complete_reservation(c);
@@ -1384,7 +1384,7 @@
up(&f->sem);
return PTR_ERR(new_metadata);
}
-
+
/* It worked. Update the inode */
inode->i_mtime = cyg_timestamp();
inode->i_size = 0;
@@ -1396,10 +1396,10 @@
jffs2_free_full_dnode(old_metadata);
}
jffs2_free_raw_inode(ri);
-
+
up(&f->sem);
jffs2_complete_reservation(c);
-
+
return 0;
}
@@ -1455,7 +1455,7 @@
pos, len, &writtenlen);
if (err)
return -err;
-
+
if (writtenlen != len)
return ENOSPC;
@@ -1733,22 +1733,22 @@
}
//==========================================================================
-//
+//
// Called by JFFS2
// ===============
-//
+//
//
//==========================================================================
-unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c,
- struct jffs2_inode_info *f,
+unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c,
+ struct jffs2_inode_info *f,
unsigned long offset,
unsigned long *priv)
{
/* FIXME: This works only with one file system mounted at a time */
int ret;
- ret = jffs2_read_inode_range(c, f, gc_buffer,
+ ret = jffs2_read_inode_range(c, f, gc_buffer,
offset & ~(PAGE_CACHE_SIZE-1), PAGE_CACHE_SIZE);
if (ret)
return ERR_PTR(ret);
@@ -1821,7 +1821,7 @@
// Called in super.c jffs2_read_super, dir.c jffs2_lookup,
// and gc.c jffs2_garbage_collect_pass
- // Must first check for cached inode
+ // Must first check for cached inode
// If this fails let new_inode create one
struct _inode *inode;
@@ -1857,14 +1857,14 @@
void jffs2_iput(struct _inode *i)
{
- // Called in jffs2_find
+ // Called in jffs2_find
// (and jffs2_open and jffs2_ops_mkdir?)
// super.c jffs2_read_super,
// and gc.c jffs2_garbage_collect_pass
recurse:
if (!i) {
printf("jffs2_iput() called with NULL inode\n");
- // and let it fault...
+ // and let it fault...
}
i->i_count--;
@@ -1874,7 +1874,7 @@
if (i->i_count)
return;
-
+
if (!i->i_nlink) {
struct _inode *parent;
@@ -1896,7 +1896,7 @@
} else {
// Evict some _other_ inode with i_count zero, leaving
- // this latest one in the cache for a while
+ // this latest one in the cache for a while
icache_evict(i->i_sb->s_root, i);
}
}
@@ -1939,9 +1939,9 @@
D1(printk(KERN_DEBUG "jffs2_new_inode(): dir_i %ld, mode 0x%x\n", dir_i->i_ino, mode));
c = JFFS2_SB_INFO(sb);
-
+
inode = new_inode(sb);
-
+
if (!inode)
return ERR_PTR(-ENOMEM);
@@ -1959,7 +1959,7 @@
if (inode->i_cache_prev)
inode->i_cache_prev->i_cache_next = inode->i_cache_next;
if (inode->i_cache_next)
- inode->i_cache_next->i_cache_prev = inode->i_cache_prev;
+ inode->i_cache_next->i_cache_prev = inode->i_cache_prev;
up(&(f->sem));
jffs2_clear_inode(inode);
memset(inode, 0x6a, sizeof(*inode));
@@ -1993,7 +1993,7 @@
c = JFFS2_SB_INFO(inode->i_sb);
jffs2_init_inode_info(f);
-
+
ret = jffs2_do_read_inode(c, f, inode->i_ino, &latest_node);
if (ret) {
@@ -2029,16 +2029,16 @@
struct jffs2_inode_cache *ic;
if (!nlink) {
/* The inode has zero nlink but its nodes weren't yet marked
- obsolete. This has to be because we're still waiting for
+ obsolete. This has to be because we're still waiting for
the final (close() and) jffs2_iput() to happen.
- There's a possibility that the final jffs2_iput() could have
+ There's a possibility that the final jffs2_iput() could have
happened while we were contemplating. In order to ensure
that we don't cause a new read_inode() (which would fail)
for the inode in question, we use ilookup() in this case
instead of jffs2_iget().
- The nlink can't _become_ zero at this point because we're
+ The nlink can't _become_ zero at this point because we're
holding the alloc_sem, and jffs2_do_unlink() would also
need that while decrementing nlink on any inode.
*/
Index: gcthread.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/ecos/src/gcthread.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcthread.c 22 Jan 2005 16:01:12 -0000 1.3
+++ gcthread.c 7 Nov 2005 11:14:43 -0000 1.4
@@ -23,7 +23,7 @@
void jffs2_garbage_collect_trigger(struct jffs2_sb_info *c)
{
struct super_block *sb=OFNI_BS_2SFFJ(c);
-
+
/* Wake up the thread */
D1(printk("jffs2_garbage_collect_trigger\n"));
@@ -31,54 +31,54 @@
}
-void
+void
jffs2_start_garbage_collect_thread(struct jffs2_sb_info *c)
{
struct super_block *sb=OFNI_BS_2SFFJ(c);
-
+
CYG_ASSERTC(c);
CYG_ASSERTC(!sb->s_gc_thread_handle);
-
+
cyg_flag_init(&sb->s_gc_thread_flags);
cyg_mutex_init(&sb->s_lock);
-
+
D1(printk("jffs2_start_garbage_collect_thread\n"));
/* Start the thread. Doesn't matter if it fails -- it's only an
* optimisation anyway */
cyg_thread_create(CYGNUM_JFFS2_GC_THREAD_PRIORITY,
- jffs2_garbage_collect_thread,
+ jffs2_garbage_collect_thread,
(cyg_addrword_t)c,"jffs2 gc thread",
(void*)sb->s_gc_thread_stack,
sizeof(sb->s_gc_thread_stack),
- &sb->s_gc_thread_handle,
+ &sb->s_gc_thread_handle,
&sb->s_gc_thread);
-
+
cyg_thread_resume(sb->s_gc_thread_handle);
}
-void
+void
jffs2_stop_garbage_collect_thread(struct jffs2_sb_info *c)
{
struct super_block *sb=OFNI_BS_2SFFJ(c);
-
+
CYG_ASSERTC(sb->s_gc_thread_handle);
-
+
D1(printk("jffs2_stop_garbage_collect_thread\n"));
/* Stop the thread and wait for it if necessary */
-
+
cyg_flag_setbits(&sb->s_gc_thread_flags,GC_THREAD_FLAG_STOP);
-
+
D1(printk("jffs2_stop_garbage_collect_thread wait\n"));
-
+
cyg_flag_wait(&sb->s_gc_thread_flags,
GC_THREAD_FLAG_HAS_EXIT,
CYG_FLAG_WAITMODE_OR| CYG_FLAG_WAITMODE_CLR);
-
+
// Kill and free the resources ... this is safe due to the flag
// from the thread.
cyg_thread_kill(sb->s_gc_thread_handle);
cyg_thread_delete(sb->s_gc_thread_handle);
-
+
cyg_mutex_destroy(&sb->s_lock);
cyg_flag_destroy(&sb->s_gc_thread_flags);
}
@@ -91,25 +91,25 @@
struct super_block *sb=OFNI_BS_2SFFJ(c);
cyg_flag_value_t flag;
cyg_mtab_entry *mte;
-
+
D1(printk("jffs2_garbage_collect_thread START\n"));
-
+
while(1) {
flag=cyg_flag_timed_wait(&sb->s_gc_thread_flags,
GC_THREAD_FLAG_TRIG|GC_THREAD_FLAG_STOP,
CYG_FLAG_WAITMODE_OR| CYG_FLAG_WAITMODE_CLR,
cyg_current_time()+
CYGNUM_JFFS2_GS_THREAD_TICKS);
-
+
if (flag & GC_THREAD_FLAG_STOP)
break;
-
+
D1(printk("jffs2: GC THREAD GC BEGIN\n"));
mte=cyg_fs_root_lookup((cyg_dir *) sb->s_root);
CYG_ASSERT(mte, "Bad mount point");
cyg_fs_lock(mte, mte->fs->syncmode);
-
+
if (jffs2_garbage_collect_pass(c) == -ENOSPC) {
printf("No space for garbage collection. "
"Aborting JFFS2 GC thread\n");
@@ -118,7 +118,7 @@
cyg_fs_unlock(mte, mte->fs->syncmode);
D1(printk("jffs2: GC THREAD GC END\n"));
}
-
+
D1(printk("jffs2_garbage_collect_thread EXIT\n"));
cyg_flag_setbits(&sb->s_gc_thread_flags,GC_THREAD_FLAG_HAS_EXIT);
}
Index: malloc-ecos.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/ecos/src/malloc-ecos.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- malloc-ecos.c 26 Nov 2003 15:55:35 -0000 1.4
+++ malloc-ecos.c 7 Nov 2005 11:14:43 -0000 1.5
@@ -129,7 +129,7 @@
struct jffs2_raw_node_ref *jffs2_alloc_raw_node_ref(void)
{
struct jffs2_raw_node_ref * p;
-
+
cyg_drv_mutex_lock(&mutex);
p = first;
if (p != NULL)
Index: os-ecos.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/ecos/src/os-ecos.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- os-ecos.h 4 Nov 2005 08:06:26 -0000 1.26
+++ os-ecos.h 7 Nov 2005 11:14:44 -0000 1.27
@@ -56,7 +56,7 @@
struct iovec {
void *iov_base;
- ssize_t iov_len;
+ ssize_t iov_len;
};
static inline unsigned int full_name_hash(const unsigned char * name, unsigned int len) {
@@ -80,7 +80,7 @@
#define JFFS2_INODE_INFO(i) (&(i)->jffs2_i)
#define OFNI_EDONI_2SFFJ(f) ((struct _inode *) ( ((char *)f) - ((char *)(&((struct _inode *)NULL)->jffs2_i)) ) )
-
+
#define JFFS2_F_I_SIZE(f) (OFNI_EDONI_2SFFJ(f)->i_size)
#define JFFS2_F_I_MODE(f) (OFNI_EDONI_2SFFJ(f)->i_mode)
#define JFFS2_F_I_UID(f) (OFNI_EDONI_2SFFJ(f)->i_uid)
@@ -131,7 +131,7 @@
#ifdef CYGOPT_FS_JFFS2_GCTHREAD
cyg_mutex_t s_lock; // Lock the inode cache
cyg_flag_t s_gc_thread_flags; // Communication with the gcthread
- cyg_handle_t s_gc_thread_handle;
+ cyg_handle_t s_gc_thread_handle;
cyg_thread s_gc_thread;
#if (CYGNUM_JFFS2_GC_THREAD_STACK_SIZE >= CYGNUM_HAL_STACK_SIZE_MINIMUM)
char s_gc_thread_stack[CYGNUM_JFFS2_GC_THREAD_STACK_SIZE];
@@ -163,7 +163,7 @@
void jffs2_iput(struct _inode * i);
void jffs2_gc_release_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f);
struct jffs2_inode_info *jffs2_gc_fetch_inode(struct jffs2_sb_info *c, int inum, int nlink);
-unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
+unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
unsigned long offset, unsigned long *priv);
void jffs2_gc_release_page(struct jffs2_sb_info *c, unsigned char *pg, unsigned long *priv);
- Previous message: mtd/util/checkfs Makefile, 1.1, 1.2 checkfs.c, 1.7, 1.8 comm.c, 1.2,
1.3 makefiles.c, 1.1, 1.2
- Next message: mtd/fs/jffs inode-v22.c, 1.67, 1.68 inode-v23.c, 1.74, 1.75 intrep.c,
1.105, 1.106 intrep.h, 1.14, 1.15 jffs_fm.c, 1.31,
1.32 jffs_proc.c, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the linux-mtd-cvs
mailing list