*/
const char *yaffs_fs_c_version =
- "$Id: yaffs_fs.c,v 1.69 2008-08-28 02:42:11 charles Exp $";
+ "$Id: yaffs_fs.c,v 1.75 2009-03-05 01:45:28 charles Exp $";
extern const char *yaffs_guts_c_version;
#include <linux/version.h>
#define WRITE_SIZE(mtd) (mtd)->oobblock
#endif
+#if(LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27))
+#define YAFFS_USE_WRITE_BEGIN_END 1
+#else
+#define YAFFS_USE_WRITE_BEGIN_END 0
+#endif
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28))
+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
+{
+ uint64_t result = partition_size;
+ do_div(result,block_size);
+ return (uint32_t)result;
+}
+#else
+#define YCALCBLOCKS(s,b) ((s)/(b))
+#endif
+
#include <asm/uaccess.h>
#include "yportenv.h"
unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS;
unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
+unsigned int yaffs_auto_checkpoint = 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);
#else
MODULE_PARM(yaffs_traceMask,"i");
MODULE_PARM(yaffs_wr_attempts,"i");
+MODULE_PARM(yaffs_auto_checkpoint,"i");
#endif
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25))
static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
loff_t * pos);
+static ssize_t yaffs_hold_space(struct file *f);
+static void yaffs_release_space(struct file *f);
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
static int yaffs_file_flush(struct file *file, fl_owner_t id);
#else
static int yaffs_writepage(struct page *page);
#endif
+
+
+#if (YAFFS_USE_WRITE_BEGIN_END != 0)
+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned flags,
+ struct page **pagep, void **fsdata);
+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned copied,
+ struct page *pg, void *fsdadata);
+#else
static int yaffs_prepare_write(struct file *f, struct page *pg,
unsigned offset, unsigned to);
static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
unsigned to);
+
+#endif
static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
int buflen);
static struct address_space_operations yaffs_file_address_operations = {
.readpage = yaffs_readpage,
.writepage = yaffs_writepage,
+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
+ .write_begin = yaffs_write_begin,
+ .write_end = yaffs_write_end,
+#else
.prepare_write = yaffs_prepare_write,
.commit_write = yaffs_commit_write,
+#endif
};
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
.fsync = yaffs_sync_object,
.splice_read = generic_file_splice_read,
.splice_write = generic_file_splice_write,
+ .llseek = generic_file_llseek,
};
#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
static void yaffs_GrossLock(yaffs_Device * dev)
{
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs locking %p\n",current));
down(&dev->grossLock);
+ T(YAFFS_TRACE_OS, ( "yaffs locked %p\n",current));
+
}
static void yaffs_GrossUnlock(yaffs_Device * dev)
{
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs unlocking %p\n",current));
up(&dev->grossLock);
}
yaffs_GrossLock(dev);
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_lookup for %d:%s\n",
+ ( "yaffs_lookup for %d:%s\n",
yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
obj =
if (obj) {
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_lookup found %d\n", obj->objectId));
+ ( "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,
- (KERN_DEBUG "yaffs_loookup dentry \n"));
+ ( "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, (KERN_DEBUG "yaffs_lookup not found\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs_lookup not found\n"));
}
if (obj) {
dev = obj->myDev;
yaffs_GrossLock(dev);
- yaffs_DeleteFile(obj);
+ yaffs_DeleteObject(obj);
yaffs_GrossUnlock(dev);
}
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
yaffs_Device *dev = obj->myDev;
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_file_flush object %d (%s)\n", obj->objectId,
+ ( "yaffs_file_flush object %d (%s)\n", obj->objectId,
obj->dirty ? "dirty" : "clean"));
yaffs_GrossLock(dev);
yaffs_Device *dev;
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage at %08x, size %08x\n",
+ T(YAFFS_TRACE_OS, ( "yaffs_readpage at %08x, size %08x\n",
(unsigned)(pg->index << PAGE_CACHE_SHIFT),
(unsigned)PAGE_CACHE_SIZE));
flush_dcache_page(pg);
kunmap(pg);
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage done\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs_readpage done\n"));
return ret;
}
if (offset > inode->i_size) {
T(YAFFS_TRACE_OS,
- (KERN_DEBUG
+ (
"yaffs_writepage at %08x, inode size = %08x!!!\n",
(unsigned)(page->index << PAGE_CACHE_SHIFT),
(unsigned)inode->i_size));
T(YAFFS_TRACE_OS,
- (KERN_DEBUG " -> don't care!!\n"));
+ ( " -> don't care!!\n"));
unlock_page(page);
return 0;
}
yaffs_GrossLock(obj->myDev);
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_writepage at %08x, size %08x\n",
+ ( "yaffs_writepage at %08x, size %08x\n",
(unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "writepag0: obj = %05x, ino = %05x\n",
+ ( "writepag0: obj = %05x, ino = %05x\n",
(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
nWritten =
nBytes, 0);
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "writepag1: obj = %05x, ino = %05x\n",
+ ( "writepag1: obj = %05x, ino = %05x\n",
(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
yaffs_GrossUnlock(obj->myDev);
return (nWritten == nBytes) ? 0 : -ENOSPC;
}
+
+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned flags,
+ struct page **pagep, void **fsdata)
+
+{
+ struct page *pg = NULL;
+ pgoff_t index = pos >> PAGE_CACHE_SHIFT;
+ uint32_t offset = pos & (PAGE_CACHE_SIZE - 1);
+ uint32_t to = offset + len;
+
+ int ret = 0;
+ int space_held = 0;
+
+ T(YAFFS_TRACE_OS, ( "start yaffs_write_begin\n"));
+ /* Get a page */
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
+ pg = grab_cache_page_write_begin(mapping,index,flags);
+#else
+ pg = __grab_cache_page(mapping,index);
+#endif
+
+ *pagep = pg;
+ if(!pg){
+ ret = -ENOMEM;
+ goto out;
+ }
+ /* Get fs space */
+ space_held = yaffs_hold_space(filp);
+
+ if(!space_held){
+ ret = -ENOSPC;
+ goto out;
+ }
+
+ /* Update page if required */
+
+ if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
+ ret = yaffs_readpage_nolock(filp, pg);
+
+ if(ret)
+ goto out;
+
+ /* Happy path return */
+ T(YAFFS_TRACE_OS, ( "end yaffs_write_begin - ok\n"));
+
+ return 0;
+
+out:
+ T(YAFFS_TRACE_OS, ( "end yaffs_write_begin fail returning %d\n",ret));
+ if(space_held){
+ yaffs_release_space(filp);
+ }
+ if(pg) {
+ unlock_page(pg);
+ page_cache_release(pg);
+ }
+ return ret;
+}
+
+#else
+
static int yaffs_prepare_write(struct file *f, struct page *pg,
unsigned offset, unsigned to)
{
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_prepair_write\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs_prepair_write\n"));
if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
return yaffs_readpage_nolock(f, pg);
-
return 0;
}
+#endif
+
+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned copied,
+ struct page *pg, void *fsdadata)
+{
+ int ret = 0;
+ void *addr, *kva;
+ uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE -1);
+
+
+
+ kva=kmap(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));
+
+ 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",
+ ret, copied ));
+ SetPageError(pg);
+ ClearPageUptodate(pg);
+ } else {
+ SetPageUptodate(pg);
+ }
+
+ kunmap(pg);
+
+ yaffs_release_space(filp);
+ unlock_page(pg);
+ page_cache_release(pg);
+ return ret;
+}
+#else
static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
unsigned to)
int nWritten;
unsigned spos = pos;
- unsigned saddr = (unsigned)addr;
+ unsigned saddr;
kva=kmap(pg);
addr = kva + offset;
+ saddr = (unsigned) addr;
+
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_commit_write addr %x pos %x nBytes %d\n", saddr,
+ ( "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,
- (KERN_DEBUG
+ (
"yaffs_commit_write not same size nWritten %d nBytes %d\n",
nWritten, nBytes));
SetPageError(pg);
kunmap(pg);
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_commit_write returning %d\n",
+ ( "yaffs_commit_write returning %d\n",
nWritten == nBytes ? 0 : nWritten));
return nWritten == nBytes ? 0 : nWritten;
}
+#endif
+
static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object * obj)
{
inode->i_nlink = yaffs_GetObjectLinkCount(obj);
T(YAFFS_TRACE_OS,
- (KERN_DEBUG
+ (
"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,
- (KERN_DEBUG "yaffs_FileInode invalid parameters\n"));
+ ( "yaffs_FileInode invalid parameters\n"));
}
}
if (!sb) {
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_get_inode for NULL super_block!!\n"));
+ ( "yaffs_get_inode for NULL super_block!!\n"));
return NULL;
}
if (!obj) {
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_get_inode for NULL object!!\n"));
+ ( "yaffs_get_inode for NULL object!!\n"));
return NULL;
}
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
+ ( "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,
- (KERN_DEBUG "yaffs_file_write: hey obj is null!\n"));
+ ( "yaffs_file_write: hey obj is null!\n"));
} else {
T(YAFFS_TRACE_OS,
- (KERN_DEBUG
- "yaffs_file_write about to write writing %d bytes"
+ (
+ "yaffs_file_write about to write writing %zu bytes"
"to object %d at %d\n",
n, obj->objectId, ipos));
}
nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_file_write writing %d bytes, %d written at %d\n",
+ ( "yaffs_file_write writing %zu bytes, %d written at %d\n",
n, nWritten, ipos));
if (nWritten > 0) {
ipos += nWritten;
inode->i_blocks = (ipos + 511) >> 9;
T(YAFFS_TRACE_OS,
- (KERN_DEBUG
+ (
"yaffs_file_write size updated to %d bytes, "
"%d blocks\n",
ipos, (int)(inode->i_blocks)));
return nWritten == 0 ? -ENOSPC : nWritten;
}
+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
+/* For now we just assume few parallel writes and check against a small number. */
+/* Todo: need to do this with a counter to handle parallel reads better */
+
+static ssize_t yaffs_hold_space(struct file *f)
+{
+ yaffs_Object *obj;
+ yaffs_Device *dev;
+
+ int nFreeChunks;
+
+
+ obj = yaffs_DentryToObject(f->f_dentry);
+
+ dev = obj->myDev;
+
+ yaffs_GrossLock(dev);
+
+ nFreeChunks = yaffs_GetNumberOfFreeChunks(dev);
+
+ yaffs_GrossUnlock(dev);
+
+ return (nFreeChunks > 20) ? 1 : 0;
+}
+
+static void yaffs_release_space(struct file *f)
+{
+ yaffs_Object *obj;
+ yaffs_Device *dev;
+
+
+ obj = yaffs_DentryToObject(f->f_dentry);
+
+ dev = obj->myDev;
+
+ yaffs_GrossLock(dev);
+
+
+ yaffs_GrossUnlock(dev);
+
+}
+
static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
{
yaffs_Object *obj;
if (offset == 0) {
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_readdir: entry . ino %d \n",
+ ( "yaffs_readdir: entry . ino %d \n",
(int)inode->i_ino));
if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR)
< 0) {
}
if (offset == 1) {
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_readdir: entry .. ino %d \n",
+ ( "yaffs_readdir: entry .. ino %d \n",
(int)f->f_dentry->d_parent->d_inode->i_ino));
if (filldir
(dirent, "..", 2, offset,
yaffs_GetObjectName(l, name,
YAFFS_MAX_NAME_LENGTH + 1);
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_readdir: %s inode %d\n", name,
+ ( "yaffs_readdir: %s inode %d\n", name,
yaffs_GetObjectInode(l)));
if (filldir(dirent,
/*
* File creation. Allocate an inode, and we're done..
*/
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+#define YCRED(x) x
+#else
+#define YCRED(x) x->cred
+#endif
+
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
dev_t rdev)
yaffs_Object *parent = yaffs_InodeToObject(dir);
int error = -ENOSPC;
- uid_t uid = current->fsuid;
- gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
+ uid_t uid = YCRED(current)->fsuid;
+ gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
if((dir->i_mode & S_ISGID) && S_ISDIR(mode))
mode |= S_ISGID;
if (parent) {
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_mknod: parent object %d type %d\n",
+ ( "yaffs_mknod: parent object %d type %d\n",
parent->objectId, parent->variantType));
} else {
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_mknod: could not get parent object\n"));
+ ( "yaffs_mknod: could not get parent object\n"));
return -EPERM;
}
switch (mode & S_IFMT) {
default:
/* Special (socket, fifo, device...) */
- T(YAFFS_TRACE_OS, (KERN_DEBUG
+ T(YAFFS_TRACE_OS, (
"yaffs_mknod: making special\n"));
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
obj =
#endif
break;
case S_IFREG: /* file */
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
+ T(YAFFS_TRACE_OS, ( "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,
- (KERN_DEBUG "yaffs_mknod: making directory\n"));
+ ( "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, (KERN_DEBUG "yaffs_mknod: making file\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs_mknod: making symlink\n"));
obj = NULL; /* Do we ever get here? */
break;
}
inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
d_instantiate(dentry, inode);
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_mknod created object %d count = %d\n",
+ ( "yaffs_mknod created object %d count = %d\n",
obj->objectId, atomic_read(&inode->i_count)));
error = 0;
} else {
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_mknod failed making object\n"));
+ ( "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, (KERN_DEBUG "yaffs_mkdir\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs_mkdir\n"));
retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
#if 0
/* attempt to fix dir bug - didn't work */
static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
#endif
{
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_create\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs_create\n"));
return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
}
yaffs_Device *dev;
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_unlink %d:%s\n", (int)(dir->i_ino),
+ ( "yaffs_unlink %d:%s\n", (int)(dir->i_ino),
dentry->d_name.name));
dev = yaffs_InodeToObject(dir)->myDev;
yaffs_Object *link = NULL;
yaffs_Device *dev;
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_link\n"));
+ T(YAFFS_TRACE_OS, ( "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,
- (KERN_DEBUG "yaffs_link link count %d i_count %d\n",
+ ( "yaffs_link link count %d i_count %d\n",
old_dentry->d_inode->i_nlink,
atomic_read(&old_dentry->d_inode->i_count)));
{
yaffs_Object *obj;
yaffs_Device *dev;
- uid_t uid = current->fsuid;
- gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
+ uid_t uid = YCRED(current)->fsuid;
+ gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_symlink\n"));
+ T(YAFFS_TRACE_OS, ( "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);
- T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink created OK\n"));
+ T(YAFFS_TRACE_OS, ( "symlink created OK\n"));
return 0;
} else {
- T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink not created\n"));
+ T(YAFFS_TRACE_OS, ( "symlink not created\n"));
}
dev = obj->myDev;
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_object\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs_sync_object\n"));
yaffs_GrossLock(dev);
yaffs_FlushFile(obj, 1);
yaffs_GrossUnlock(dev);
int retVal = YAFFS_FAIL;
yaffs_Object *target;
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_rename\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs_rename\n"));
dev = yaffs_InodeToObject(old_dir)->myDev;
yaffs_GrossLock(dev);
target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
!ylist_empty(&target->variant.directoryVariant.children)) {
- T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
+ T(YAFFS_TRACE_OS, ( "target is non-empty dir\n"));
retVal = YAFFS_FAIL;
} else {
/* Now does unlinking internally using shadowing mechanism */
- T(YAFFS_TRACE_OS, (KERN_DEBUG "calling yaffs_RenameObject\n"));
+ T(YAFFS_TRACE_OS, ( "calling yaffs_RenameObject\n"));
retVal =
yaffs_RenameObject(yaffs_InodeToObject(old_dir),
yaffs_Device *dev;
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_setattr of object %d\n",
+ ( "yaffs_setattr of object %d\n",
yaffs_InodeToObject(inode)->objectId));
if ((error = inode_change_ok(inode, attr)) == 0) {
yaffs_Device *dev = yaffs_SuperToDevice(sb);
#endif
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_statfs\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs_statfs\n"));
yaffs_GrossLock(dev);
{
yaffs_Device *dev = yaffs_SuperToDevice(sb);
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_do_sync_fs\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs_do_sync_fs\n"));
if(sb->s_dirt) {
yaffs_GrossLock(dev);
#endif
{
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_write_super\n"));
- yaffs_do_sync_fs(sb);
+ T(YAFFS_TRACE_OS, ( "yaffs_write_super\n"));
+ if (yaffs_auto_checkpoint >= 2)
+ yaffs_do_sync_fs(sb);
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
return 0;
#endif
#endif
{
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_fs\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs_sync_fs\n"));
- yaffs_do_sync_fs(sb);
+ if (yaffs_auto_checkpoint >= 1)
+ yaffs_do_sync_fs(sb);
return 0;
yaffs_Device *dev = yaffs_SuperToDevice(sb);
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_iget for %lu\n", ino));
+ ( "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,
- (KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
+ ( "yaffs_read_inode for %d\n", (int)inode->i_ino));
yaffs_GrossLock(dev);
struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_remount_fs: %s: RO\n", dev->name ));
+ ( "yaffs_remount_fs: %s: RO\n", dev->name ));
yaffs_GrossLock(dev);
}
else {
T(YAFFS_TRACE_OS,
- (KERN_DEBUG "yaffs_remount_fs: %s: RW\n", dev->name ));
+ ( "yaffs_remount_fs: %s: RW\n", dev->name ));
}
return 0;
{
yaffs_Device *dev = yaffs_SuperToDevice(sb);
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_put_super\n"));
+ T(YAFFS_TRACE_OS, ( "yaffs_put_super\n"));
yaffs_GrossLock(dev);
{
struct super_block *sb = (struct super_block *)vsb;
- T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_MarkSuperBlockDirty() sb = %p\n",sb));
-// if(sb)
-// sb->s_dirt = 1;
+ T(YAFFS_TRACE_OS, ( "yaffs_MarkSuperBlockDirty() sb = %p\n",sb));
+ if(sb)
+ sb->s_dirt = 1;
}
typedef struct {
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, (" size %d\n", mtd->size));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
+#else
+ T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
+#endif
#ifdef CONFIG_YAFFS_AUTO_YAFFS2
/* Set up the memory size parameters.... */
- nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
+ nBlocks = YCALCBLOCKS(mtd->size ,(YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
+
dev->startBlock = 0;
dev->endBlock = nBlocks - 1;
dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
dev->totalBytesPerChunk = mtd->oobblock;
dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
#endif
- nBlocks = mtd->size / mtd->erasesize;
+ nBlocks = YCALCBLOCKS(mtd->size,mtd->erasesize);
dev->startBlock = 0;
dev->endBlock = nBlocks - 1;
return NULL;
}
sb->s_root = root;
+ sb->s_dirt = !dev->isCheckpointed;
+ T(YAFFS_TRACE_ALWAYS,
+ ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
return sb;