/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-2009 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>
* >> inode->u.generic_ip points to the associated yaffs_Object.
*/
-const char *yaffs_fs_c_version =
- "$Id: yaffs_fs.c,v 1.98 2010-03-10 01:22:19 charles Exp $";
-extern const char *yaffs_guts_c_version;
-
#include <linux/version.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10))
#define YAFFS_COMPILE_BACKGROUND
#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28))
+#define YAFFS_COMPILE_EXPORTFS
+#endif
+
+
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
#include <linux/config.h>
#endif
+
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/ctype.h>
+#ifdef YAFFS_COMPILE_EXPORTFS
+#include <linux/exportfs.h>
+#endif
+
#ifdef YAFFS_COMPILE_BACKGROUND
#include <linux/kthread.h>
#include <linux/delay.h>
+#include <linux/freezer.h>
#endif
-
-#include "asm/div64.h"
-
-
-#define LOCK_TRACE 0
+#include <asm/div64.h>
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-#include <linux/statfs.h> /* Added NCB 15-8-2003 */
#include <linux/statfs.h>
+
#define UnlockPage(p) unlock_page(p)
#define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags)
#endif
#include <linux/uaccess.h>
+#include <linux/mtd/mtd.h>
#include "yportenv.h"
#include "yaffs_trace.h"
#include "yaffs_linux.h"
-#include <linux/mtd/mtd.h>
#include "yaffs_mtdif.h"
#include "yaffs_mtdif1.h"
#include "yaffs_mtdif2.h"
unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS;
unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
unsigned int yaffs_auto_checkpoint = 1;
+unsigned int yaffs_gc_control = 1;
/* Module Parameters */
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
module_param(yaffs_traceMask, uint, 0644);
module_param(yaffs_wr_attempts, uint, 0644);
module_param(yaffs_auto_checkpoint, uint, 0644);
+module_param(yaffs_gc_control, uint, 0644);
#else
MODULE_PARM(yaffs_traceMask, "i");
MODULE_PARM(yaffs_wr_attempts, "i");
MODULE_PARM(yaffs_auto_checkpoint, "i");
+MODULE_PARM(yaffs_gc_control, "i");
#endif
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
#endif
-/*#define T(x) printk x */
-
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
#define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
#else
#else
static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
#endif
+static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin);
static struct address_space_operations yaffs_file_address_operations = {
.readpage = yaffs_readpage,
.read = generic_read_dir,
.readdir = yaffs_readdir,
.fsync = yaffs_sync_object,
+ .llseek = yaffs_dir_llseek,
};
static const struct super_operations yaffs_super_ops = {
.sync_fs = yaffs_sync_fs,
.write_super = yaffs_write_super,
};
+
+static unsigned yaffs_gc_control_callback(yaffs_Device *dev)
+{
+ return yaffs_gc_control;
+}
static void yaffs_GrossLock(yaffs_Device *dev)
{
- T(LOCK_TRACE && YAFFS_TRACE_OS, ("yaffs locking %p\n", current));
+ T(YAFFS_TRACE_LOCK, (TSTR("yaffs locking %p\n"), current));
down(&(yaffs_DeviceToContext(dev)->grossLock));
- T(LOCK_TRACE && YAFFS_TRACE_OS, ("yaffs locked %p\n", current));
+ T(YAFFS_TRACE_LOCK, (TSTR("yaffs locked %p\n"), current));
}
static void yaffs_GrossUnlock(yaffs_Device *dev)
{
- T(LOCK_TRACE && YAFFS_TRACE_OS, ("yaffs unlocking %p\n", current));
+ T(YAFFS_TRACE_LOCK, (TSTR("yaffs unlocking %p\n"), current));
up(&(yaffs_DeviceToContext(dev)->grossLock));
}
+#ifdef YAFFS_COMPILE_EXPORTFS
+
+static struct inode *
+yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino, uint32_t generation)
+{
+ return Y_IGET(sb, ino);
+}
+
+static struct dentry *
+yaffs2_fh_to_dentry(struct super_block *sb, struct fid *fid, int fh_len, int fh_type)
+{
+ return generic_fh_to_dentry(sb, fid, fh_len, fh_type, yaffs2_nfs_get_inode) ;
+}
+
+static struct dentry *
+ yaffs2_fh_to_parent(struct super_block *sb, struct fid *fid, int fh_len, int fh_type)
+{
+ return generic_fh_to_parent(sb, fid, fh_len, fh_type, yaffs2_nfs_get_inode);
+}
+
+struct dentry *yaffs2_get_parent(struct dentry *dentry)
+{
+
+ struct super_block *sb = dentry->d_inode->i_sb;
+ struct dentry *parent = ERR_PTR(-ENOENT);
+ struct inode *inode;
+ unsigned long parent_ino;
+ yaffs_Object *d_obj;
+ yaffs_Object *parent_obj;
+
+ d_obj = yaffs_InodeToObject(dentry->d_inode);
+
+ if (d_obj) {
+ parent_obj = d_obj->parent;
+ if (parent_obj) {
+ parent_ino = yaffs_GetObjectInode(parent_obj);
+ inode = Y_IGET(sb, parent_ino);
+
+ if (IS_ERR(inode)) {
+ parent = ERR_CAST(inode);
+ } else {
+ parent = d_obtain_alias(inode);
+ if (!IS_ERR(parent)) {
+ parent = ERR_PTR(-ENOMEM);
+ iput(inode);
+ }
+ }
+ }
+ }
+
+ return parent;
+}
+
+/* Just declare a zero structure as a NULL value implies
+ * using the default functions of exportfs.
+ */
+
+static struct export_operations yaffs_export_ops =
+{
+ .fh_to_dentry = yaffs2_fh_to_dentry,
+ .fh_to_parent = yaffs2_fh_to_parent,
+ .get_parent = yaffs2_get_parent,
+} ;
+
+#endif
/*-----------------------------------------------------------------*/
/* Directory search context allows us to unlock access to yaffs during
yaffs_Device *dev = yaffs_InodeToObject(dir)->myDev;
- yaffs_GrossLock(dev);
+ if(current != yaffs_DeviceToContext(dev)->readdirProcess)
+ yaffs_GrossLock(dev);
T(YAFFS_TRACE_OS,
- ("yaffs_lookup for %d:%s\n",
+ (TSTR("yaffs_lookup for %d:%s\n"),
yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),
obj = yaffs_GetEquivalentObject(obj); /* in case it was a hardlink */
/* Can't hold gross lock when calling yaffs_get_inode() */
- yaffs_GrossUnlock(dev);
+ if(current != yaffs_DeviceToContext(dev)->readdirProcess)
+ yaffs_GrossUnlock(dev);
if (obj) {
T(YAFFS_TRACE_OS,
- ("yaffs_lookup found %d\n", obj->objectId));
+ (TSTR("yaffs_lookup found %d\n"), obj->objectId));
inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
if (inode) {
T(YAFFS_TRACE_OS,
- ("yaffs_loookup dentry \n"));
+ (TSTR("yaffs_loookup dentry \n")));
/* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
* d_add even if NULL inode */
#if 0
}
} else {
- T(YAFFS_TRACE_OS, ("yaffs_lookup not found\n"));
+ T(YAFFS_TRACE_OS,(TSTR("yaffs_lookup not found\n")));
}
static void yaffs_put_inode(struct inode *inode)
{
T(YAFFS_TRACE_OS,
- ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
+ (TSTR("yaffs_put_inode: ino %d, count %d\n"), (int)inode->i_ino,
atomic_read(&inode->i_count)));
}
obj = yaffs_InodeToObject(inode);
T(YAFFS_TRACE_OS,
- ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
+ (TSTR("yaffs_clear_inode: ino %d, count %d %s\n"), (int)inode->i_ino,
atomic_read(&inode->i_count),
obj ? "object exists" : "null object"));
yaffs_Device *dev;
T(YAFFS_TRACE_OS,
- ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
+ (TSTR("yaffs_delete_inode: ino %d, count %d %s\n"), (int)inode->i_ino,
atomic_read(&inode->i_count),
obj ? "object exists" : "null object"));
yaffs_Device *dev = obj->myDev;
T(YAFFS_TRACE_OS,
- ("yaffs_file_flush object %d (%s)\n", obj->objectId,
+ (TSTR("yaffs_file_flush object %d (%s)\n"), obj->objectId,
obj->dirty ? "dirty" : "clean"));
yaffs_GrossLock(dev);
yaffs_Device *dev;
- T(YAFFS_TRACE_OS, ("yaffs_readpage_nolock at %08x, size %08x\n",
- (unsigned)(pg->index << PAGE_CACHE_SHIFT),
- (unsigned)PAGE_CACHE_SIZE));
+ T(YAFFS_TRACE_OS,
+ (TSTR("yaffs_readpage_nolock at %08x, size %08x\n"),
+ (unsigned)(pg->index << PAGE_CACHE_SHIFT),
+ (unsigned)PAGE_CACHE_SIZE));
obj = yaffs_DentryToObject(f->f_dentry);
flush_dcache_page(pg);
kunmap(pg);
- T(YAFFS_TRACE_OS, ("yaffs_readpage_nolock done\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage_nolock done\n")));
return ret;
}
{
int ret;
- T(YAFFS_TRACE_OS, ("yaffs_readpage\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage\n")));
ret=yaffs_readpage_unlock(f, pg);
- T(YAFFS_TRACE_OS, ("yaffs_readpage done\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage done\n")));
return ret;
}
if (page->index > end_index || !nBytes) {
T(YAFFS_TRACE_OS,
- ("yaffs_writepage at %08x, inode size = %08x!!!\n",
+ (TSTR("yaffs_writepage at %08x, inode size = %08x!!!\n"),
(unsigned)(page->index << PAGE_CACHE_SHIFT),
(unsigned)inode->i_size));
T(YAFFS_TRACE_OS,
- (" -> don't care!!\n"));
+ (TSTR(" -> don't care!!\n")));
zero_user_segment(page,0,PAGE_CACHE_SIZE);
set_page_writeback(page);
yaffs_GrossLock(obj->myDev);
T(YAFFS_TRACE_OS,
- ("yaffs_writepage at %08x, size %08x\n",
+ (TSTR("yaffs_writepage at %08x, size %08x\n"),
(unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
T(YAFFS_TRACE_OS,
- ("writepag0: obj = %05x, ino = %05x\n",
+ (TSTR("writepag0: obj = %05x, ino = %05x\n"),
(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
nWritten = yaffs_WriteDataToFile(obj, buffer,
page->index << PAGE_CACHE_SHIFT, nBytes, 0);
T(YAFFS_TRACE_OS,
- ("writepag1: obj = %05x, ino = %05x\n",
+ (TSTR("writepag1: obj = %05x, ino = %05x\n"),
(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
yaffs_GrossUnlock(obj->myDev);
ret = -ENOMEM;
goto out;
}
- T(YAFFS_TRACE_OS, ("start yaffs_write_begin index %d(%x) uptodate %d\n",(int)index,(int)index,Page_Uptodate(pg) ? 1 : 0));
+ T(YAFFS_TRACE_OS,
+ (TSTR("start yaffs_write_begin index %d(%x) uptodate %d\n"),
+ (int)index,(int)index,Page_Uptodate(pg) ? 1 : 0));
/* Get fs space */
space_held = yaffs_hold_space(filp);
goto out;
/* Happy path return */
- T(YAFFS_TRACE_OS, ("end yaffs_write_begin - ok\n"));
+ T(YAFFS_TRACE_OS, (TSTR("end yaffs_write_begin - ok\n")));
return 0;
out:
- T(YAFFS_TRACE_OS, ("end yaffs_write_begin fail returning %d\n", ret));
+ T(YAFFS_TRACE_OS,
+ (TSTR("end yaffs_write_begin fail returning %d\n"), ret));
if (space_held)
yaffs_release_space(filp);
if (pg) {
static int yaffs_prepare_write(struct file *f, struct page *pg,
unsigned offset, unsigned to)
{
- T(YAFFS_TRACE_OS, ("yaffs_prepair_write\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_prepair_write\n")));
if (!Page_Uptodate(pg))
return yaffs_readpage_nolock(f, pg);
addr = kva + offset_into_page;
T(YAFFS_TRACE_OS,
- ("yaffs_write_end addr %x pos %x nBytes %d\n",
- (unsigned) addr,
- (int)pos, copied));
+ ("yaffs_write_end addr %p pos %x nBytes %d\n",
+ addr,(unsigned)pos, copied));
ret = yaffs_file_write(filp, addr, copied, &pos);
if (ret != copied) {
T(YAFFS_TRACE_OS,
- ("yaffs_write_end not same size ret %d copied %d\n",
+ (TSTR("yaffs_write_end not same size ret %d copied %d\n"),
ret, copied));
SetPageError(pg);
} else {
saddr = (unsigned) addr;
T(YAFFS_TRACE_OS,
- ("yaffs_commit_write addr %x pos %x nBytes %d\n",
+ (TSTR("yaffs_commit_write addr %x pos %x nBytes %d\n"),
saddr, spos, nBytes));
nWritten = yaffs_file_write(f, addr, nBytes, &pos);
if (nWritten != nBytes) {
T(YAFFS_TRACE_OS,
- ("yaffs_commit_write not same size nWritten %d nBytes %d\n",
+ (TSTR("yaffs_commit_write not same size nWritten %d nBytes %d\n"),
nWritten, nBytes));
SetPageError(pg);
} else {
kunmap(pg);
T(YAFFS_TRACE_OS,
- ("yaffs_commit_write returning %d\n",
+ (TSTR("yaffs_commit_write returning %d\n"),
nWritten == nBytes ? 0 : nWritten));
return nWritten == nBytes ? 0 : nWritten;
inode->i_nlink = yaffs_GetObjectLinkCount(obj);
T(YAFFS_TRACE_OS,
- ("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
+ (TSTR("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n"),
inode->i_mode, inode->i_uid, inode->i_gid,
(int)inode->i_size, atomic_read(&inode->i_count)));
} else {
T(YAFFS_TRACE_OS,
- ("yaffs_FileInode invalid parameters\n"));
+ (TSTR("yaffs_FileInode invalid parameters\n")));
}
}
if (!sb) {
T(YAFFS_TRACE_OS,
- ("yaffs_get_inode for NULL super_block!!\n"));
+ (TSTR("yaffs_get_inode for NULL super_block!!\n")));
return NULL;
}
if (!obj) {
T(YAFFS_TRACE_OS,
- ("yaffs_get_inode for NULL object!!\n"));
+ (TSTR("yaffs_get_inode for NULL object!!\n")));
return NULL;
}
T(YAFFS_TRACE_OS,
- ("yaffs_get_inode for object %d\n", obj->objectId));
+ (TSTR("yaffs_get_inode for object %d\n"), obj->objectId));
inode = Y_IGET(sb, obj->objectId);
if (IS_ERR(inode))
if (!obj)
T(YAFFS_TRACE_OS,
- ("yaffs_file_write: hey obj is null!\n"));
+ (TSTR("yaffs_file_write: hey obj is null!\n")));
else
T(YAFFS_TRACE_OS,
- ("yaffs_file_write about to write writing %u(%x) bytes"
- "to object %d at %d(%x)\n",
+ (TSTR("yaffs_file_write about to write writing %u(%x) bytes"
+ "to object %d at %d(%x)\n"),
(unsigned) n, (unsigned) n, obj->objectId, ipos,ipos));
nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
T(YAFFS_TRACE_OS,
- ("yaffs_file_write: %d(%x) bytes written\n",
+ (TSTR("yaffs_file_write: %d(%x) bytes written\n"),
(unsigned )n,(unsigned)n));
if (nWritten > 0) {
inode->i_blocks = (ipos + 511) >> 9;
T(YAFFS_TRACE_OS,
- ("yaffs_file_write size updated to %d bytes, "
- "%d blocks\n",
+ (TSTR("yaffs_file_write size updated to %d bytes, "
+ "%d blocks\n"),
ipos, (int)(inode->i_blocks)));
}
yaffs_GrossUnlock(dev);
}
+
+static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin)
+{
+ long long retval;
+
+ lock_kernel();
+
+ switch (origin){
+ case 2:
+ offset += i_size_read(file->f_path.dentry->d_inode);
+ break;
+ case 1:
+ offset += file->f_pos;
+ }
+ retval = -EINVAL;
+
+ if (offset >= 0){
+ if (offset != file->f_pos)
+ file->f_pos = offset;
+
+ retval = offset;
+ }
+ unlock_kernel();
+ return retval;
+}
+
+
static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
{
yaffs_Object *obj;
yaffs_GrossLock(dev);
+ yaffs_DeviceToContext(dev)->readdirProcess = current;
+
offset = f->f_pos;
sc = yaffs_NewSearch(obj);
goto unlock_out;
}
- T(YAFFS_TRACE_OS, ("yaffs_readdir: starting at %d\n", (int)offset));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_readdir: starting at %d\n"), (int)offset));
if (offset == 0) {
T(YAFFS_TRACE_OS,
- ("yaffs_readdir: entry . ino %d \n",
+ (TSTR("yaffs_readdir: entry . ino %d \n"),
(int)inode->i_ino));
yaffs_GrossUnlock(dev);
if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)
}
if (offset == 1) {
T(YAFFS_TRACE_OS,
- ("yaffs_readdir: entry .. ino %d \n",
+ (TSTR("yaffs_readdir: entry .. ino %d \n"),
(int)f->f_dentry->d_parent->d_inode->i_ino));
yaffs_GrossUnlock(dev);
if (filldir(dirent, "..", 2, offset,
/* If the directory has changed since the open or last call to
readdir, rewind to after the 2 canned entries. */
-
if (f->f_version != inode->i_version) {
offset = 2;
f->f_pos = offset;
yaffs_GetObjectName(l, name,
YAFFS_MAX_NAME_LENGTH + 1);
T(YAFFS_TRACE_OS,
- ("yaffs_readdir: %s inode %d\n", name,
- yaffs_GetObjectInode(l)));
+ (TSTR("yaffs_readdir: %s inode %d\n"),
+ name, yaffs_GetObjectInode(l)));
yaffs_GrossUnlock(dev);
}
unlock_out:
+ yaffs_DeviceToContext(dev)->readdirProcess = NULL;
+
yaffs_GrossUnlock(dev);
out:
yaffs_EndSearch(sc);
return retVal;
}
+
+
/*
* File creation. Allocate an inode, and we're done..
*/
if (parent) {
T(YAFFS_TRACE_OS,
- ("yaffs_mknod: parent object %d type %d\n",
+ (TSTR("yaffs_mknod: parent object %d type %d\n"),
parent->objectId, parent->variantType));
} else {
T(YAFFS_TRACE_OS,
- ("yaffs_mknod: could not get parent object\n"));
+ (TSTR("yaffs_mknod: could not get parent object\n")));
return -EPERM;
}
- T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
- "mode %x dev %x\n",
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making oject for %s, "
+ "mode %x dev %x\n"),
dentry->d_name.name, mode, rdev));
dev = parent->myDev;
switch (mode & S_IFMT) {
default:
/* Special (socket, fifo, device...) */
- T(YAFFS_TRACE_OS, ("yaffs_mknod: making special\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making special\n")));
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
gid, old_encode_dev(rdev));
#endif
break;
case S_IFREG: /* file */
- T(YAFFS_TRACE_OS, ("yaffs_mknod: making file\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making file\n")));
obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
gid);
break;
case S_IFDIR: /* directory */
T(YAFFS_TRACE_OS,
- ("yaffs_mknod: making directory\n"));
+ (TSTR("yaffs_mknod: making directory\n")));
obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
uid, gid);
break;
case S_IFLNK: /* symlink */
- T(YAFFS_TRACE_OS, ("yaffs_mknod: making symlink\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making symlink\n")));
obj = NULL; /* Do we ever get here? */
break;
}
d_instantiate(dentry, inode);
update_dir_time(dir);
T(YAFFS_TRACE_OS,
- ("yaffs_mknod created object %d count = %d\n",
+ (TSTR("yaffs_mknod created object %d count = %d\n"),
obj->objectId, atomic_read(&inode->i_count)));
error = 0;
+ yaffs_FillInodeFromObject(dir,parent);
} else {
T(YAFFS_TRACE_OS,
- ("yaffs_mknod failed making object\n"));
+ (TSTR("yaffs_mknod failed making object\n")));
error = -ENOMEM;
}
static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
{
int retVal;
- T(YAFFS_TRACE_OS, ("yaffs_mkdir\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_mkdir\n")));
retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
return retVal;
}
static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
#endif
{
- T(YAFFS_TRACE_OS, ("yaffs_create\n"));
+ T(YAFFS_TRACE_OS,(TSTR("yaffs_create\n")));
return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
}
int retVal;
yaffs_Device *dev;
+ yaffs_Object *obj;
T(YAFFS_TRACE_OS,
- ("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
+ (TSTR("yaffs_unlink %d:%s\n"),
+ (int)(dir->i_ino),
dentry->d_name.name));
-
- dev = yaffs_InodeToObject(dir)->myDev;
+ obj = yaffs_InodeToObject(dir);
+ dev = obj->myDev;
yaffs_GrossLock(dev);
- retVal = yaffs_Unlink(yaffs_InodeToObject(dir), dentry->d_name.name);
+ retVal = yaffs_Unlink(obj, dentry->d_name.name);
if (retVal == YAFFS_OK) {
dentry->d_inode->i_nlink--;
yaffs_Object *link = NULL;
yaffs_Device *dev;
- T(YAFFS_TRACE_OS, ("yaffs_link\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_link\n")));
obj = yaffs_InodeToObject(inode);
dev = obj->myDev;
d_instantiate(dentry, old_dentry->d_inode);
atomic_inc(&old_dentry->d_inode->i_count);
T(YAFFS_TRACE_OS,
- ("yaffs_link link count %d i_count %d\n",
+ (TSTR("yaffs_link link count %d i_count %d\n"),
old_dentry->d_inode->i_nlink,
atomic_read(&old_dentry->d_inode->i_count)));
}
uid_t uid = YCRED(current)->fsuid;
gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- T(YAFFS_TRACE_OS, ("yaffs_symlink\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_symlink\n")));
dev = yaffs_InodeToObject(dir)->myDev;
yaffs_GrossLock(dev);
inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
d_instantiate(dentry, inode);
update_dir_time(dir);
- T(YAFFS_TRACE_OS, ("symlink created OK\n"));
+ T(YAFFS_TRACE_OS, (TSTR("symlink created OK\n")));
return 0;
} else {
- T(YAFFS_TRACE_OS, ("symlink not created\n"));
+ T(YAFFS_TRACE_OS, (TSTR("symlink not created\n")));
}
return -ENOMEM;
dev = obj->myDev;
- T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, ("yaffs_sync_object\n"));
+ T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
+ (TSTR("yaffs_sync_object\n")));
yaffs_GrossLock(dev);
yaffs_FlushFile(obj, 1, datasync);
yaffs_GrossUnlock(dev);
int retVal = YAFFS_FAIL;
yaffs_Object *target;
- T(YAFFS_TRACE_OS, ("yaffs_rename\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_rename\n")));
dev = yaffs_InodeToObject(old_dir)->myDev;
yaffs_GrossLock(dev);
if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
!ylist_empty(&target->variant.directoryVariant.children)) {
- T(YAFFS_TRACE_OS, ("target is non-empty dir\n"));
+ T(YAFFS_TRACE_OS, (TSTR("target is non-empty dir\n")));
retVal = YAFFS_FAIL;
} else {
/* Now does unlinking internally using shadowing mechanism */
- T(YAFFS_TRACE_OS, ("calling yaffs_RenameObject\n"));
+ T(YAFFS_TRACE_OS, (TSTR("calling yaffs_RenameObject\n")));
retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
old_dentry->d_name.name,
yaffs_Device *dev;
T(YAFFS_TRACE_OS,
- ("yaffs_setattr of object %d\n",
+ (TSTR("yaffs_setattr of object %d\n"),
yaffs_InodeToObject(inode)->objectId));
/* Fail if a requested resize >= 2GB */
int result;
if (!error){
error = inode_setattr(inode, attr);
- T(YAFFS_TRACE_OS,("inode_setattr called\n"));
+ T(YAFFS_TRACE_OS,(TSTR("inode_setattr called\n")));
if (attr->ia_valid & ATTR_SIZE)
truncate_inode_pages(&inode->i_data,attr->ia_size);
}
dev = yaffs_InodeToObject(inode)->myDev;
if (attr->ia_valid & ATTR_SIZE){
- T(YAFFS_TRACE_OS,("resize to %d(%x)\n",(int)(attr->ia_size),(int)(attr->ia_size)));
+ T(YAFFS_TRACE_OS,(TSTR("resize to %d(%x)\n"),
+ (int)(attr->ia_size),(int)(attr->ia_size)));
}
yaffs_GrossLock(dev);
result = yaffs_SetAttributes(yaffs_InodeToObject(inode), attr);
}
T(YAFFS_TRACE_OS,
- ("yaffs_setattr done returning %d\n",error));
+ (TSTR("yaffs_setattr done returning %d\n"),error));
return error;
}
yaffs_Device *dev = yaffs_SuperToDevice(sb);
#endif
- T(YAFFS_TRACE_OS, ("yaffs_statfs\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_statfs\n")));
yaffs_GrossLock(dev);
list_for_each_entry(iptr,&sb->s_inodes, i_sb_list){
obj = yaffs_InodeToObject(iptr);
if(obj){
- T(YAFFS_TRACE_OS, ("flushing obj %d\n",obj->objectId));
+ T(YAFFS_TRACE_OS, (TSTR("flushing obj %d\n"),
+ obj->objectId));
yaffs_FlushFile(obj,1,0);
}
}
yaffs_CheckpointSave(dev);
}
-static int yaffs_do_sync_fs(struct super_block *sb, int do_checkpoint)
+
+static unsigned yaffs_bg_gc_urgency(yaffs_Device *dev)
+{
+ unsigned erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock;
+ struct yaffs_LinuxContext *context = yaffs_DeviceToContext(dev);
+ unsigned scatteredFree = 0; /* Free chunks not in an erased block */
+
+ if(erasedChunks < dev->nFreeChunks)
+ scatteredFree = (dev->nFreeChunks - erasedChunks);
+
+ if(!context->bgRunning)
+ return 0;
+ else if(scatteredFree < (dev->param.nChunksPerBlock * 2))
+ return 0;
+ else if(erasedChunks > dev->nFreeChunks/2)
+ return 0;
+ else if(erasedChunks > dev->nFreeChunks/4)
+ return 1;
+ else
+ return 2;
+}
+
+static int yaffs_do_sync_fs(struct super_block *sb,
+ int request_checkpoint)
{
yaffs_Device *dev = yaffs_SuperToDevice(sb);
- T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
- ("yaffs_do_sync_fs: %s %s\n",
+ unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4);
+ unsigned gc_urgent = yaffs_bg_gc_urgency(dev);
+ int do_checkpoint;
+
+ T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
+ (TSTR("yaffs_do_sync_fs: gc-urgency %d %s %s%s\n"),
+ gc_urgent,
sb->s_dirt ? "dirty" : "clean",
- do_checkpoint ? "with checkpoint" : "no checkpoint"));
+ request_checkpoint ? "checkpoint requested" : "no checkpoint",
+ oneshot_checkpoint ? " one-shot" : "" ));
- if (sb->s_dirt) {
- yaffs_GrossLock(dev);
- yaffs_FlushSuperBlock(sb,do_checkpoint);
- yaffs_GrossUnlock(dev);
+ yaffs_GrossLock(dev);
+ do_checkpoint = ((request_checkpoint && !gc_urgent) ||
+ oneshot_checkpoint) &&
+ !dev->isCheckpointed;
+ if (sb->s_dirt || do_checkpoint) {
+ yaffs_FlushSuperBlock(sb, !dev->isCheckpointed && do_checkpoint);
sb->s_dirt = 0;
+ if(oneshot_checkpoint)
+ yaffs_auto_checkpoint &= ~4;
}
+ yaffs_GrossUnlock(dev);
+
return 0;
}
*/
#ifdef YAFFS_COMPILE_BACKGROUND
+
+void yaffs_background_waker(unsigned long data)
+{
+ wake_up_process((struct task_struct *)data);
+}
+
static int yaffs_BackgroundThread(void *data)
{
yaffs_Device *dev = (yaffs_Device *)data;
struct yaffs_LinuxContext *context = yaffs_DeviceToContext(dev);
+ unsigned long now = jiffies;
+ unsigned long next_dir_update = now;
+ unsigned long next_gc = now;
+ unsigned long expires;
+ unsigned int urgency;
+
+ int gcResult;
+ struct timer_list timer;
T(YAFFS_TRACE_BACKGROUND,
- ("yaffs_background starting for dev %p\n",
+ (TSTR("yaffs_background starting for dev %p\n"),
(void *)dev));
-
+
+ set_freezable();
+
while(context->bgRunning){
T(YAFFS_TRACE_BACKGROUND,
- ("yaffs_background\n"));
+ (TSTR("yaffs_background\n")));
if(kthread_should_stop())
break;
+
+ if(try_to_freeze())
+ continue;
+
yaffs_GrossLock(dev);
- yaffs_UpdateDirtyDirectories(dev);
+
+ now = jiffies;
+
+ if(time_after(now, next_dir_update)){
+ yaffs_UpdateDirtyDirectories(dev);
+ next_dir_update = now + HZ;
+ }
+
+ if(time_after(now,next_gc)){
+ if(!dev->isCheckpointed){
+ urgency = yaffs_bg_gc_urgency(dev);
+ gcResult = yaffs_BackgroundGarbageCollect(dev, urgency);
+ if(urgency > 1)
+ next_gc = now + HZ/20+1;
+ else if(urgency > 0)
+ next_gc = now + HZ/10+1;
+ else
+ next_gc = now + HZ * 2;
+ } else /*
+ * gc not running so set to next_dir_update
+ * to cut down on wake ups
+ */
+ next_gc = next_dir_update;
+ }
yaffs_GrossUnlock(dev);
- msleep(500);
+#if 1
+ expires = next_dir_update;
+ if (time_before(next_gc,expires))
+ expires = next_gc;
+ if(time_before(expires,now))
+ expires = now + HZ;
+
+ init_timer(&timer);
+ timer.expires = expires+1;
+ timer.data = (unsigned long) current;
+ timer.function = yaffs_background_waker;
+
+ set_current_state(TASK_INTERRUPTIBLE);
+ add_timer(&timer);
+ schedule();
+ del_timer_sync(&timer);
+#else
+ msleep(10);
+#endif
}
+
return 0;
}
static int yaffs_BackgroundStart(yaffs_Device *dev)
{
int retval = 0;
-
struct yaffs_LinuxContext *context = yaffs_DeviceToContext(dev);
context->bgRunning = 1;
- context->bgThread = kthread_run(yaffs_BackgroundThread,(void *)dev,"yaffs_%x",(unsigned)dev);
+ context->bgThread = kthread_run(yaffs_BackgroundThread,
+ (void *)dev,"yaffs-bg");
if(IS_ERR(context->bgThread)){
retval = PTR_ERR(context->bgThread);
static int yaffs_write_super(struct super_block *sb)
#endif
{
+ unsigned request_checkpoint = (yaffs_auto_checkpoint >= 2);
- T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, ("yaffs_write_super\n"));
- yaffs_do_sync_fs(sb, yaffs_auto_checkpoint >= 2);
+ T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
+ (TSTR("yaffs_write_super%s\n"),
+ request_checkpoint ? " checkpt" : ""));
+
+ yaffs_do_sync_fs(sb, request_checkpoint);
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
return 0;
static int yaffs_sync_fs(struct super_block *sb)
#endif
{
- T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, ("yaffs_sync_fs\n"));
+ unsigned request_checkpoint = (yaffs_auto_checkpoint >= 1);
+
+ T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
+ (TSTR("yaffs_sync_fs%s\n"),
+ request_checkpoint ? " checkpt" : ""));
- yaffs_do_sync_fs(sb,yaffs_auto_checkpoint >= 1);
+ yaffs_do_sync_fs(sb, request_checkpoint);
return 0;
}
yaffs_Device *dev = yaffs_SuperToDevice(sb);
T(YAFFS_TRACE_OS,
- ("yaffs_iget for %lu\n", ino));
+ (TSTR("yaffs_iget for %lu\n"), ino));
inode = iget_locked(sb, ino);
if (!inode)
yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
T(YAFFS_TRACE_OS,
- ("yaffs_read_inode for %d\n", (int)inode->i_ino));
+ (TSTR("yaffs_read_inode for %d\n"), (int)inode->i_ino));
- yaffs_GrossLock(dev);
+ if(current != yaffs_DeviceToContext(dev)->readdirProcess)
+ yaffs_GrossLock(dev);
obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
yaffs_FillInodeFromObject(inode, obj);
- yaffs_GrossUnlock(dev);
+ if(current != yaffs_DeviceToContext(dev)->readdirProcess)
+ yaffs_GrossUnlock(dev);
}
#endif
static YLIST_HEAD(yaffs_context_list);
+struct semaphore yaffs_context_lock;
#if 0 /* not used */
static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
T(YAFFS_TRACE_OS,
- ("yaffs_remount_fs: %s: RO\n", dev->name));
+ (TSTR("yaffs_remount_fs: %s: RO\n"), dev->name));
yaffs_GrossLock(dev);
yaffs_GrossUnlock(dev);
} else {
T(YAFFS_TRACE_OS,
- ("yaffs_remount_fs: %s: RW\n", dev->name));
+ (TSTR("yaffs_remount_fs: %s: RW\n"), dev->name));
}
return 0;
{
yaffs_Device *dev = yaffs_SuperToDevice(sb);
- T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_put_super\n")));
+
+ T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
+ (TSTR("Shutting down yaffs background thread\n")));
+ yaffs_BackgroundStop(dev);
+ T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
+ (TSTR("yaffs background thread shut down\n")));
yaffs_GrossLock(dev);
if (yaffs_DeviceToContext(dev)->putSuperFunc)
yaffs_DeviceToContext(dev)->putSuperFunc(sb);
- yaffs_BackgroundStop(dev);
yaffs_Deinitialise(dev);
yaffs_GrossUnlock(dev);
- /* we assume this is protected by lock_kernel() in mount/umount */
+ down(&yaffs_context_lock);
ylist_del_init(&(yaffs_DeviceToContext(dev)->contextList));
+ up(&yaffs_context_lock);
if (yaffs_DeviceToContext(dev)->spareBuffer) {
YFREE(yaffs_DeviceToContext(dev)->spareBuffer);
{
struct super_block *sb = yaffs_DeviceToContext(dev)->superBlock;
- T(YAFFS_TRACE_OS, ("yaffs_MarkSuperBlockDirty() sb = %p\n", sb));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_MarkSuperBlockDirty() sb = %p\n"), sb));
if (sb)
sb->s_dirt = 1;
}
sb->s_op = &yaffs_super_ops;
sb->s_flags |= MS_NOATIME;
+#ifdef YAFFS_COMPILE_EXPORTFS
+ sb->s_export_op = &yaffs_export_ops;
+#endif
+
if (!sb)
printk(KERN_INFO "yaffs: sb is NULL\n");
else if (!sb->s_dev)
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
- T(YAFFS_TRACE_OS, ("yaffs_read_super: Using yaffs%d\n", yaffsVersion));
- T(YAFFS_TRACE_OS,
- ("yaffs_read_super: block size %d\n", (int)(sb->s_blocksize)));
-#ifdef CONFIG_YAFFS_DISABLE_WRITE_VERIFY
T(YAFFS_TRACE_OS,
- ("yaffs: Write verification disabled. All guarantees "
- "null and void\n"));
-#endif
+ (TSTR("yaffs_read_super: Using yaffs%d\n"), yaffsVersion));
+ T(YAFFS_TRACE_OS,
+ (TSTR("yaffs_read_super: block size %d\n"),
+ (int)(sb->s_blocksize)));
- T(YAFFS_TRACE_ALWAYS, ("yaffs: Attempting MTD mount on %u.%u, "
- "\"%s\"\n",
- MAJOR(sb->s_dev), MINOR(sb->s_dev),
- yaffs_devname(sb, devname_buf)));
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR("yaffs: Attempting MTD mount of %u.%u,\"%s\"\n"),
+ MAJOR(sb->s_dev), MINOR(sb->s_dev),
+ yaffs_devname(sb, devname_buf)));
/* Check it's an mtd device..... */
if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
if (!mtd) {
T(YAFFS_TRACE_ALWAYS,
- ("yaffs: MTD device #%u doesn't appear to exist\n",
- MINOR(sb->s_dev)));
+ (TSTR("yaffs: MTD device #%u doesn't appear to exist\n"),
+ MINOR(sb->s_dev)));
return NULL;
}
/* Check it's NAND */
if (mtd->type != MTD_NANDFLASH) {
T(YAFFS_TRACE_ALWAYS,
- ("yaffs: MTD device is not NAND it's type %d\n", mtd->type));
+ (TSTR("yaffs: MTD device is not NAND it's type %d\n"),
+ mtd->type));
return NULL;
}
- T(YAFFS_TRACE_OS, (" erase %p\n", mtd->erase));
- T(YAFFS_TRACE_OS, (" read %p\n", mtd->read));
- T(YAFFS_TRACE_OS, (" write %p\n", mtd->write));
- T(YAFFS_TRACE_OS, (" readoob %p\n", mtd->read_oob));
- T(YAFFS_TRACE_OS, (" writeoob %p\n", mtd->write_oob));
- T(YAFFS_TRACE_OS, (" block_isbad %p\n", mtd->block_isbad));
- T(YAFFS_TRACE_OS, (" block_markbad %p\n", mtd->block_markbad));
- T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
- T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
- T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
+ T(YAFFS_TRACE_OS, (TSTR(" erase %p\n"), mtd->erase));
+ T(YAFFS_TRACE_OS, (TSTR(" read %p\n"), mtd->read));
+ T(YAFFS_TRACE_OS, (TSTR(" write %p\n"), mtd->write));
+ T(YAFFS_TRACE_OS, (TSTR(" readoob %p\n"), mtd->read_oob));
+ T(YAFFS_TRACE_OS, (TSTR(" writeoob %p\n"), mtd->write_oob));
+ T(YAFFS_TRACE_OS, (TSTR(" block_isbad %p\n"), mtd->block_isbad));
+ T(YAFFS_TRACE_OS, (TSTR(" block_markbad %p\n"), mtd->block_markbad));
+ T(YAFFS_TRACE_OS, (TSTR(" %s %d\n"), WRITE_SIZE_STR, WRITE_SIZE(mtd)));
+ T(YAFFS_TRACE_OS, (TSTR(" oobsize %d\n"), mtd->oobsize));
+ T(YAFFS_TRACE_OS, (TSTR(" erasesize %d\n"), mtd->erasesize));
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
- T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
+ T(YAFFS_TRACE_OS, (TSTR(" size %u\n"), mtd->size));
#else
- T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
+ T(YAFFS_TRACE_OS, (TSTR(" size %lld\n"), mtd->size));
#endif
#ifdef CONFIG_YAFFS_AUTO_YAFFS2
if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {
- T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs2\n"));
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR("yaffs: auto selecting yaffs2\n")));
yaffsVersion = 2;
}
/* Added NCB 26/5/2006 for completeness */
if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {
- T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs1\n"));
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR("yaffs: auto selecting yaffs1\n")));
yaffsVersion = 1;
}
!mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
#endif
T(YAFFS_TRACE_ALWAYS,
- ("yaffs: MTD device does not support required "
- "functions\n"));;
+ (TSTR("yaffs: MTD device does not support required "
+ "functions\n")));
return NULL;
}
mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
!options.inband_tags) {
T(YAFFS_TRACE_ALWAYS,
- ("yaffs: MTD device does not have the "
- "right page sizes\n"));
+ (TSTR("yaffs: MTD device does not have the "
+ "right page sizes\n")));
return NULL;
}
} else {
!mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
#endif
T(YAFFS_TRACE_ALWAYS,
- ("yaffs: MTD device does not support required "
- "functions\n"));;
+ (TSTR("yaffs: MTD device does not support required "
+ "functions\n")));
return NULL;
}
if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK ||
mtd->oobsize != YAFFS_BYTES_PER_SPARE) {
T(YAFFS_TRACE_ALWAYS,
- ("yaffs: MTD device does not support have the "
- "right page sizes\n"));
+ (TSTR("yaffs: MTD device does not support have the "
+ "right page sizes\n")));
return NULL;
}
}
if (!dev) {
/* Deep shit could not allocate device structure */
T(YAFFS_TRACE_ALWAYS,
- ("yaffs_read_super: Failed trying to allocate "
- "yaffs_Device. \n"));
+ (TSTR("yaffs_read_super: Failed trying to allocate "
+ "yaffs_Device. \n")));
return NULL;
}
memset(dev, 0, sizeof(yaffs_Device));
#ifdef CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING
param->refreshPeriod = 0;
#else
- param->refreshPeriod = 10000;
+ param->refreshPeriod = 500;
#endif
if(options.empty_lost_and_found_overridden)
yaffs_DeviceToContext(dev)->putSuperFunc = yaffs_MTDPutSuper;
param->markSuperBlockDirty = yaffs_MarkSuperBlockDirty;
+ param->gcControl = yaffs_gc_control_callback;
yaffs_DeviceToContext(dev)->superBlock= sb;
param->skipCheckpointWrite = options.skip_checkpoint_write;
/* we assume this is protected by lock_kernel() in mount/umount */
+ down(&yaffs_context_lock);
ylist_add_tail(&(yaffs_DeviceToContext(dev)->contextList), &yaffs_context_list);
+ up(&yaffs_context_lock);
/* Directory search handling...*/
YINIT_LIST_HEAD(&(yaffs_DeviceToContext(dev)->searchContexts));
err = yaffs_GutsInitialise(dev);
T(YAFFS_TRACE_OS,
- ("yaffs_read_super: guts initialised %s\n",
+ (TSTR("yaffs_read_super: guts initialised %s\n"),
(err == YAFFS_OK) ? "OK" : "FAILED"));
if(err == YAFFS_OK)
inode->i_op = &yaffs_dir_inode_operations;
inode->i_fop = &yaffs_dir_operations;
- T(YAFFS_TRACE_OS, ("yaffs_read_super: got root inode\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: got root inode\n")));
root = d_alloc_root(inode);
- T(YAFFS_TRACE_OS, ("yaffs_read_super: d_alloc_root done\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: d_alloc_root done\n")));
if (!root) {
iput(inode);
sb->s_root = root;
sb->s_dirt = !dev->isCheckpointed;
T(YAFFS_TRACE_ALWAYS,
- ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
+ (TSTR("yaffs_read_super: isCheckpointed %d\n"),
+ dev->isCheckpointed));
- T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
+ T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: done\n")));
return sb;
}
#endif /* CONFIG_YAFFS_YAFFS2 */
static struct proc_dir_entry *my_proc_entry;
+static struct proc_dir_entry *debug_proc_entry;
static char *yaffs_dump_dev_part0(char *buf, yaffs_Device * dev)
{
buf += sprintf(buf, "emptyLostAndFound.. %d\n", dev->param.emptyLostAndFound);
buf += sprintf(buf, "disableLazyLoad.... %d\n", dev->param.disableLazyLoad);
buf += sprintf(buf, "refreshPeriod...... %d\n", dev->param.refreshPeriod);
+ buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->param.nShortOpCaches);
+ buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->param.nReservedBlocks);
buf += sprintf(buf, "\n");
buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
- buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->param.nReservedBlocks);
buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
+ buf += sprintf(buf, "\n");
buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
buf += sprintf(buf, "nObjectsCreated.... %d\n", dev->nObjectsCreated);
buf += sprintf(buf, "nFreeObjects....... %d\n", dev->nFreeObjects);
buf += sprintf(buf, "nFreeChunks........ %d\n", dev->nFreeChunks);
- buf += sprintf(buf, "nPageWrites........ %d\n", dev->nPageWrites);
- buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
- buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
- buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
- buf += sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
- buf += sprintf(buf, "passiveGCs......... %d\n", dev->passiveGarbageCollections);
- buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
- buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->param.nShortOpCaches);
- buf += sprintf(buf, "nRetireBlocks...... %d\n", dev->nRetiredBlocks);
- buf += sprintf(buf, "eccFixed........... %d\n", dev->eccFixed);
- buf += sprintf(buf, "eccUnfixed......... %d\n", dev->eccUnfixed);
- buf += sprintf(buf, "tagsEccFixed....... %d\n", dev->tagsEccFixed);
- buf += sprintf(buf, "tagsEccUnfixed..... %d\n", dev->tagsEccUnfixed);
- buf += sprintf(buf, "cacheHits.......... %d\n", dev->cacheHits);
- buf += sprintf(buf, "nDeletedFiles...... %d\n", dev->nDeletedFiles);
- buf += sprintf(buf, "nUnlinkedFiles..... %d\n", dev->nUnlinkedFiles);
- buf += sprintf(buf, "refreshCount....... %d\n", dev->refreshCount);
+ buf += sprintf(buf, "\n");
+ buf += sprintf(buf, "nPageWrites........ %u\n", dev->nPageWrites);
+ buf += sprintf(buf, "nPageReads......... %u\n", dev->nPageReads);
+ buf += sprintf(buf, "nBlockErasures..... %u\n", dev->nBlockErasures);
+ buf += sprintf(buf, "nGCCopies.......... %u\n", dev->nGCCopies);
+ buf += sprintf(buf, "allGCs............. %u\n", dev->allGCs);
+ buf += sprintf(buf, "passiveGCs......... %u\n", dev->passiveGCs);
+ buf += sprintf(buf, "oldestDirtyGCs..... %u\n", dev->oldestDirtyGCs);
+ buf += sprintf(buf, "backgroundGCs...... %u\n", dev->backgroundGCs);
+ buf += sprintf(buf, "nRetriedWrites..... %u\n", dev->nRetriedWrites);
+ buf += sprintf(buf, "nRetireBlocks...... %u\n", dev->nRetiredBlocks);
+ buf += sprintf(buf, "eccFixed........... %u\n", dev->eccFixed);
+ buf += sprintf(buf, "eccUnfixed......... %u\n", dev->eccUnfixed);
+ buf += sprintf(buf, "tagsEccFixed....... %u\n", dev->tagsEccFixed);
+ buf += sprintf(buf, "tagsEccUnfixed..... %u\n", dev->tagsEccUnfixed);
+ buf += sprintf(buf, "cacheHits.......... %u\n", dev->cacheHits);
+ buf += sprintf(buf, "nDeletedFiles...... %u\n", dev->nDeletedFiles);
+ buf += sprintf(buf, "nUnlinkedFiles..... %u\n", dev->nUnlinkedFiles);
+ buf += sprintf(buf, "refreshCount....... %u\n", dev->refreshCount);
buf +=
- sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
+ sprintf(buf, "nBackgroudDeletions %u\n", dev->nBackgroundDeletions);
return buf;
}
/* Print header first */
if (step == 0)
- buf += sprintf(buf, "YAFFS built:" __DATE__ " " __TIME__
- "\n%s\n%s\n", yaffs_fs_c_version,
- yaffs_guts_c_version);
+ buf += sprintf(buf, "YAFFS built:" __DATE__ " " __TIME__"\n");
else if (step == 1)
buf += sprintf(buf,"\n");
else {
step-=2;
- /* hold lock_kernel while traversing yaffs_dev_list */
- lock_kernel();
+ down(&yaffs_context_lock);
/* Locate and print the Nth entry. Order N-squared but N is small. */
ylist_for_each(item, &yaffs_context_list) {
break;
}
- unlock_kernel();
+ up(&yaffs_context_lock);
}
return buf - page < count ? buf - page : count;
}
+static int yaffs_stats_proc_read(char *page,
+ char **start,
+ off_t offset, int count, int *eof, void *data)
+{
+ struct ylist_head *item;
+ char *buf = page;
+ int n = 0;
+
+ down(&yaffs_context_lock);
+
+ /* Locate and print the Nth entry. Order N-squared but N is small. */
+ ylist_for_each(item, &yaffs_context_list) {
+ struct yaffs_LinuxContext *dc = ylist_entry(item, struct yaffs_LinuxContext, contextList);
+ yaffs_Device *dev = dc->dev;
+
+ int erasedChunks;
+ int nObjects;
+ int nTnodes;
+
+ erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock;
+ nObjects = dev->nObjectsCreated -dev->nFreeObjects;
+ nTnodes = dev->nTnodesCreated - dev->nFreeTnodes;
+
+
+ buf += sprintf(buf,"%d, %d, %d, %u, %u, %d, %d\n",
+ n, dev->nFreeChunks, erasedChunks,
+ dev->backgroundGCs, dev->oldestDirtyGCs,
+ nObjects, nTnodes);
+ }
+ up(&yaffs_context_lock);
+
+
+ return buf - page < count ? buf - page : count;
+}
+
/**
* Set the verbosity of the warnings and error messages.
*
} mask_flags[] = {
{"allocate", YAFFS_TRACE_ALLOCATE},
{"always", YAFFS_TRACE_ALWAYS},
+ {"background", YAFFS_TRACE_BACKGROUND},
{"bad_blocks", YAFFS_TRACE_BAD_BLOCKS},
{"buffers", YAFFS_TRACE_BUFFERS},
{"bug", YAFFS_TRACE_BUG},
{"error", YAFFS_TRACE_ERROR},
{"gc_detail", YAFFS_TRACE_GC_DETAIL},
{"gc", YAFFS_TRACE_GC},
+ {"lock", YAFFS_TRACE_LOCK},
{"mtd", YAFFS_TRACE_MTD},
{"nandaccess", YAFFS_TRACE_NANDACCESS},
{"os", YAFFS_TRACE_OS},
{"scan", YAFFS_TRACE_SCAN},
{"tracing", YAFFS_TRACE_TRACING},
{"sync", YAFFS_TRACE_SYNC},
-
- {"background", YAFFS_TRACE_BACKGROUND},
+ {"write", YAFFS_TRACE_WRITE},
{"verify", YAFFS_TRACE_VERIFY},
{"verify_nand", YAFFS_TRACE_VERIFY_NAND},
{"verify_full", YAFFS_TRACE_VERIFY_FULL},
{"verify_all", YAFFS_TRACE_VERIFY_ALL},
- {"write", YAFFS_TRACE_WRITE},
{"all", 0xffffffff},
{"none", 0},
{NULL, 0},
if (rg & YAFFS_TRACE_ALWAYS) {
for (i = 0; mask_flags[i].mask_name != NULL; i++) {
char flag;
- flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-';
+ flag = ((rg & mask_flags[i].mask_bitfield) ==
+ mask_flags[i].mask_bitfield) ? '+' : '-';
printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
}
}
struct file_system_to_install *fsinst;
T(YAFFS_TRACE_ALWAYS,
- ("yaffs " __DATE__ " " __TIME__ " Installing. \n"));
+ (TSTR("yaffs built " __DATE__ " " __TIME__ " Installing. \n")));
+
+#ifdef CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR(" \n\n\n\nYAFFS-WARNING CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED selected.\n\n\n\n")));
+#endif
+
- /* Install the proc_fs entry */
+
+
+ init_MUTEX(&yaffs_context_lock);
+
+ /* Install the proc_fs entries */
my_proc_entry = create_proc_entry("yaffs",
S_IRUGO | S_IFREG,
YPROC_ROOT);
} else
return -ENOMEM;
+ debug_proc_entry = create_proc_entry("yaffs_stats",
+ S_IRUGO | S_IFREG,
+ YPROC_ROOT);
+
+ if (debug_proc_entry) {
+ debug_proc_entry->write_proc = NULL;
+ debug_proc_entry->read_proc = yaffs_stats_proc_read;
+ debug_proc_entry->data = NULL;
+ } else
+ return -ENOMEM;
+
/* Now add the file system entries */
fsinst = fs_to_install;
struct file_system_to_install *fsinst;
- T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
- " removing. \n"));
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR("yaffs built " __DATE__ " " __TIME__ " removing. \n")));
remove_proc_entry("yaffs", YPROC_ROOT);
+ remove_proc_entry("yaffs_stats", YPROC_ROOT);
fsinst = fs_to_install;
module_exit(exit_yaffs_fs)
MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");
-MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2006");
+MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2010");
MODULE_LICENSE("GPL");
projects / yaffs2.git / blobdiff