X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_vfs_multi.c;h=a36d9bfaa9d2ba8c21bcf5af02095ab947b07002;hp=ce41d6c81d8150a0ad59a70fec185c2645d167c7;hb=eb65ac45ecf8279ba5c8657c302a3df32f0af06e;hpb=4d8ae2ff95b889fd2ea14a7e33ec934e4386ee57 diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c index ce41d6c..a36d9bf 100644 --- a/yaffs_vfs_multi.c +++ b/yaffs_vfs_multi.c @@ -1,8 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2011 Aleph One Ltd. - * for Toby Churchill Ltd and Brightstar Engineering + * Copyright (C) 2002-2018 Aleph One Ltd. * * Created by Charles Manning * Acknowledgements: @@ -36,6 +35,9 @@ * for any version of Linux. */ #include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) +#include +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)) #define YAFFS_COMPILE_BACKGROUND @@ -56,12 +58,18 @@ #define YAFFS_HAS_EVICT_INODE #endif -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13)) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13)) && \ + (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) #define YAFFS_NEW_FOLLOW_LINK 1 #else #define YAFFS_NEW_FOLLOW_LINK 0 #endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)) +#define YAFFS_HAS_WRITE_SUPER +#endif + + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) #include #endif @@ -104,10 +112,10 @@ #include #define UnlockPage(p) unlock_page(p) -#define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags) +#define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags) /* FIXME: use sb->s_id instead ? */ -#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) +#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) #else @@ -125,21 +133,15 @@ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)) #define YPROC_ROOT (&proc_root) #else -#define YPROC_ROOT NULL +#define YPROC_ROOT NULL #endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)) #define Y_INIT_TIMER(a) init_timer(a) -#else +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) #define Y_INIT_TIMER(a) init_timer_on_stack(a) -#endif - -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) -#define WRITE_SIZE_STR "writesize" -#define WRITE_SIZE(mtd) ((mtd)->writesize) #else -#define WRITE_SIZE_STR "oobblock" -#define WRITE_SIZE(mtd) ((mtd)->oobblock) +#define Y_INIT_TIMER(a,cb) timer_setup_on_stack(a,cb,0) #endif #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27)) @@ -148,6 +150,9 @@ #define YAFFS_USE_WRITE_BEGIN_END 0 #endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)) +#define YAFFS_SUPER_HAS_DIRTY +#endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) @@ -172,14 +177,12 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size) #include "yaffs_trace.h" #include "yaffs_guts.h" #include "yaffs_attribs.h" - #include "yaffs_linux.h" - #include "yaffs_mtdif.h" -#include "yaffs_mtdif1.h" -#include "yaffs_mtdif2.h" +#include "yaffs_packedtags2.h" +#include "yaffs_getblockinfo.h" -unsigned int yaffs_trace_mask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS; +unsigned int yaffs_trace_mask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS | 0; unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS; unsigned int yaffs_auto_checkpoint = 1; unsigned int yaffs_gc_control = 1; @@ -202,14 +205,12 @@ MODULE_PARM(yaffs_gc_control, "i"); #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)) /* use iget and read_inode */ #define Y_IGET(sb, inum) iget((sb), (inum)) -static void yaffs_read_inode(struct inode *inode); #else /* Call local equivalent */ #define YAFFS_USE_OWN_IGET #define Y_IGET(sb, inum) yaffs_iget((sb), (inum)) -static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino); #endif #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18)) @@ -228,730 +229,540 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino); #define yaffs_super_to_dev(sb) ((struct yaffs_dev *)sb->u.generic_sbp) #endif -#define update_dir_time(dir) do {\ - (dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \ - } while (0) - -static void yaffs_put_super(struct super_block *sb); - -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); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) +#define Y_CLEAR_INODE(i) clear_inode(i) #else -static int yaffs_file_flush(struct file *file); +#define Y_CLEAR_INODE(i) end_writeback(i) #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) -static int yaffs_sync_object(struct file *file, loff_t start, loff_t end, int datasync); -#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)) -static int yaffs_sync_object(struct file *file, int datasync); -#else -static int yaffs_sync_object(struct file *file, struct dentry *dentry, - int datasync); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) +#define YAFFS_USE_DIR_ITERATE #endif -static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)) +#define YAFFS_USE_XATTR +#endif -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode, - struct nameidata *n); -static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, - struct nameidata *n); -#else -static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode); -static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) +#define YAFFS_NEW_PROCFS +#include #endif -static int yaffs_link(struct dentry *old_dentry, struct inode *dir, - struct dentry *dentry); -static int yaffs_unlink(struct inode *dir, struct dentry *dentry); -static int yaffs_symlink(struct inode *dir, struct dentry *dentry, - const char *symname); -static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode); -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, - dev_t dev); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) +#define PAGE_CACHE_SIZE PAGE_SIZE +#define PAGE_CACHE_SHIFT PAGE_SHIFT +#define Y_GET_DENTRY(f) ((f)->f_path.dentry) +#define YAFFS_NEW_XATTR 1 +#define YAFFS_NEW_GET_LINK 1 #else -static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, - int dev); +#define Y_GET_DENTRY(f) ((f)->f_dentry) +#define YAFFS_NEW_XATTR 0 +#define YAFFS_NEW_GET_LINK 0 #endif -static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, - struct inode *new_dir, struct dentry *new_dentry); -static int yaffs_setattr(struct dentry *dentry, struct iattr *attr); -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) -static int yaffs_sync_fs(struct super_block *sb, int wait); -static void yaffs_write_super(struct super_block *sb); -#else -static int yaffs_sync_fs(struct super_block *sb); -static int yaffs_write_super(struct super_block *sb); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) +#define page_cache_release put_page #endif -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) -static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf); -#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)) +#define update_dir_time(dir) do {\ + (dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \ + } while (0) +#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4,18,0)) +#define update_dir_time(dir) do {\ + (dir)->i_ctime = (dir)->i_mtime = current_kernel_time(); \ + } while (0) #else -static int yaffs_statfs(struct super_block *sb, struct statfs *buf); +#define update_dir_time(dir) do {\ + (dir)->i_ctime = (dir)->i_mtime = current_kernel_time64(); \ + } while (0) #endif -#ifdef YAFFS_HAS_PUT_INODE -static void yaffs_put_inode(struct inode *inode); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)) +static inline int setattr_prepare(struct dentry *dentry, struct iattr *attr) +{ + return inode_change_ok(dentry->d_inode, attr); +} #endif -#ifdef YAFFS_HAS_EVICT_INODE -static void yaffs_evict_inode(struct inode *); -#else -static void yaffs_delete_inode(struct inode *); -static void yaffs_clear_inode(struct inode *); -#endif +static void yaffs_fill_inode_from_obj(struct inode *inode, + struct yaffs_obj *obj); -static int yaffs_readpage(struct file *file, struct page *page); -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -static int yaffs_writepage(struct page *page, struct writeback_control *wbc); -#else -static int yaffs_writepage(struct page *page); -#endif -static int yaffs_setxattr(struct dentry *dentry, const char *name, - const void *value, size_t size, int flags); -static ssize_t yaffs_getxattr(struct dentry *dentry, const char *name, - void *buff, size_t size); -static int yaffs_removexattr(struct dentry *dentry, const char *name); -static ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size); +static void yaffs_gross_lock(struct yaffs_dev *dev) +{ + yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locking %p", current); + mutex_lock(&(yaffs_dev_to_lc(dev)->gross_lock)); + yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locked %p", current); +} -#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); +static void yaffs_gross_unlock(struct yaffs_dev *dev) +{ + yaffs_trace(YAFFS_TRACE_LOCK, "yaffs unlocking %p", current); + mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock)); +} -#endif -static int yaffs_readlink(struct dentry *dentry, char __user * buffer, - int buflen); -#if (YAFFS_NEW_FOLLOW_LINK == 1) -void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias); -static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd); -#else -static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd); -#endif +static int yaffs_readpage_nolock(struct file *f, struct page *pg) +{ + /* Lifted from jffs2 */ + + struct yaffs_obj *obj; + unsigned char *pg_buf; + int ret; + loff_t pos = ((loff_t) pg->index) << PAGE_SHIFT; + struct yaffs_dev *dev; -static void yaffs_touch_super(struct yaffs_dev *dev); + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_readpage_nolock at %lld, size %08x", + (long long)pos, + (unsigned)PAGE_SIZE); -static int yaffs_vfs_setattr(struct inode *, struct iattr *); + obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); -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, + dev = obj->my_dev; + +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + BUG_ON(!PageLocked(pg)); #else - .prepare_write = yaffs_prepare_write, - .commit_write = yaffs_commit_write, + if (!PageLocked(pg)) + PAGE_BUG(pg); #endif -}; -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22)) -static const struct file_operations yaffs_file_operations = { - .read = do_sync_read, - .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, - .mmap = generic_file_mmap, - .flush = yaffs_file_flush, - .fsync = yaffs_sync_object, - .splice_read = generic_file_splice_read, - .splice_write = generic_file_splice_write, - .llseek = generic_file_llseek, -}; + pg_buf = kmap(pg); + /* FIXME: Can kmap fail? */ -#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18)) + yaffs_gross_lock(dev); -static const struct file_operations yaffs_file_operations = { - .read = do_sync_read, - .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, - .mmap = generic_file_mmap, - .flush = yaffs_file_flush, - .fsync = yaffs_sync_object, - .sendfile = generic_file_sendfile, -}; + ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE); -#else + yaffs_gross_unlock(dev); -static const struct file_operations yaffs_file_operations = { - .read = generic_file_read, - .write = generic_file_write, - .mmap = generic_file_mmap, - .flush = yaffs_file_flush, - .fsync = yaffs_sync_object, -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) - .sendfile = generic_file_sendfile, -#endif -}; -#endif + if (ret >= 0) + ret = 0; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)) -static void zero_user_segment(struct page *page, unsigned start, unsigned end) + if (ret) { + ClearPageUptodate(pg); + SetPageError(pg); + } else { + SetPageUptodate(pg); + ClearPageError(pg); + } + + flush_dcache_page(pg); + kunmap(pg); + + yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage_nolock done"); + return ret; +} + +static int yaffs_readpage_unlock(struct file *f, struct page *pg) { - void *kaddr = kmap_atomic(page, KM_USER0); - memset(kaddr + start, 0, end - start); - kunmap_atomic(kaddr, KM_USER0); - flush_dcache_page(page); + int ret = yaffs_readpage_nolock(f, pg); + UnlockPage(pg); + return ret; } -#endif -static const struct inode_operations yaffs_file_inode_operations = { - .setattr = yaffs_setattr, - .setxattr = yaffs_setxattr, - .getxattr = yaffs_getxattr, - .listxattr = yaffs_listxattr, - .removexattr = yaffs_removexattr, -}; +static int yaffs_readpage(struct file *f, struct page *pg) +{ + int ret; -static const struct inode_operations yaffs_symlink_inode_operations = { - .readlink = yaffs_readlink, - .follow_link = yaffs_follow_link, -#if (YAFFS_NEW_FOLLOW_LINK == 1) - .put_link = yaffs_put_link, -#endif - .setattr = yaffs_setattr, - .setxattr = yaffs_setxattr, - .getxattr = yaffs_getxattr, - .listxattr = yaffs_listxattr, - .removexattr = yaffs_removexattr, -}; + yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage"); + ret = yaffs_readpage_unlock(f, pg); + yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done"); + return ret; +} -static const struct inode_operations yaffs_dir_inode_operations = { - .create = yaffs_create, - .lookup = yaffs_lookup, - .link = yaffs_link, - .unlink = yaffs_unlink, - .symlink = yaffs_symlink, - .mkdir = yaffs_mkdir, - .rmdir = yaffs_unlink, - .mknod = yaffs_mknod, - .rename = yaffs_rename, - .setattr = yaffs_setattr, - .setxattr = yaffs_setxattr, - .getxattr = yaffs_getxattr, - .listxattr = yaffs_listxattr, - .removexattr = yaffs_removexattr, -}; -static const struct file_operations yaffs_dir_operations = { - .read = generic_read_dir, - .readdir = yaffs_readdir, - .fsync = yaffs_sync_object, - .llseek = generic_file_llseek, -}; +static void yaffs_set_super_dirty_val(struct yaffs_dev *dev, int val) +{ + struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev); -static const struct super_operations yaffs_super_ops = { - .statfs = yaffs_statfs, + if (lc) + lc->dirty = val; -#ifndef YAFFS_USE_OWN_IGET - .read_inode = yaffs_read_inode, -#endif -#ifdef YAFFS_HAS_PUT_INODE - .put_inode = yaffs_put_inode, -#endif - .put_super = yaffs_put_super, -#ifdef YAFFS_HAS_EVICT_INODE - .evict_inode = yaffs_evict_inode, -#else - .delete_inode = yaffs_delete_inode, - .clear_inode = yaffs_clear_inode, -#endif - .sync_fs = yaffs_sync_fs, - .write_super = yaffs_write_super, -}; +# ifdef YAFFS_SUPER_HAS_DIRTY + { + struct super_block *sb = lc->super; -static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) -{ -#ifdef YAFFS_USE_SETATTR_COPY - setattr_copy(inode, attr); - return 0; -#else - return inode_setattr(inode, attr); + if (sb) + sb->s_dirt = val; + } #endif } -static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize) +static void yaffs_set_super_dirty(struct yaffs_dev *dev) { -#ifdef YAFFS_USE_TRUNCATE_SETSIZE - truncate_setsize(inode, newsize); - return 0; -#else - truncate_inode_pages(&inode->i_data, newsize); - return 0; -#endif - + yaffs_set_super_dirty_val(dev, 1); } -static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev) +static void yaffs_clear_super_dirty(struct yaffs_dev *dev) { - return yaffs_gc_control; + yaffs_set_super_dirty_val(dev, 0); } -static void yaffs_gross_lock(struct yaffs_dev *dev) +static int yaffs_check_super_dirty(struct yaffs_dev *dev) { - yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locking %p", current); - mutex_lock(&(yaffs_dev_to_lc(dev)->gross_lock)); - yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locked %p", current); -} + struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev); -static void yaffs_gross_unlock(struct yaffs_dev *dev) -{ - yaffs_trace(YAFFS_TRACE_LOCK, "yaffs unlocking %p", current); - mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock)); -} + if (lc && lc->dirty) + return 1; -#ifdef YAFFS_COMPILE_EXPORTFS +# ifdef YAFFS_SUPER_HAS_DIRTY + { + struct super_block *sb = lc->super; -static struct inode *yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino, - uint32_t generation) -{ - return Y_IGET(sb, ino); -} + if (sb && sb->s_dirt) + return 1; + } +#endif + return 0; -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) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) +static int yaffs_writepage(struct page *page, struct writeback_control *wbc) +#else +static int yaffs_writepage(struct page *page) +#endif { - return generic_fh_to_parent(sb, fid, fh_len, fh_type, - yaffs2_nfs_get_inode); -} + struct yaffs_dev *dev; + struct address_space *mapping = page->mapping; + struct inode *inode; + unsigned long end_index; + char *buffer; + struct yaffs_obj *obj; + int n_written = 0; + unsigned n_bytes; + loff_t i_size; -struct dentry *yaffs2_get_parent(struct dentry *dentry) -{ + if (!mapping) + BUG(); + inode = mapping->host; + if (!inode) + BUG(); + i_size = i_size_read(inode); - struct super_block *sb = dentry->d_inode->i_sb; - struct dentry *parent = ERR_PTR(-ENOENT); - struct inode *inode; - unsigned long parent_ino; - struct yaffs_obj *d_obj; - struct yaffs_obj *parent_obj; + end_index = i_size >> PAGE_CACHE_SHIFT; - d_obj = yaffs_inode_to_obj(dentry->d_inode); + if (page->index < end_index) + n_bytes = PAGE_CACHE_SIZE; + else { + n_bytes = i_size & (PAGE_CACHE_SIZE - 1); - if (d_obj) { - parent_obj = d_obj->parent; - if (parent_obj) { - parent_ino = yaffs_get_obj_inode(parent_obj); - inode = Y_IGET(sb, parent_ino); + if (page->index > end_index || !n_bytes) { + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_writepage at %lld, inode size = %lld!!", + ((loff_t)page->index) << PAGE_CACHE_SHIFT, + inode->i_size); + yaffs_trace(YAFFS_TRACE_OS, + " -> don't care!!"); - if (IS_ERR(inode)) { - parent = ERR_CAST(inode); - } else { - parent = d_obtain_alias(inode); - if (!IS_ERR(parent)) { - parent = ERR_PTR(-ENOMEM); - iput(inode); - } - } + zero_user_segment(page, 0, PAGE_CACHE_SIZE); + set_page_writeback(page); + unlock_page(page); + end_page_writeback(page); + return 0; } } - return parent; -} + if (n_bytes != PAGE_CACHE_SIZE) + zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE); -/* Just declare a zero structure as a NULL value implies - * using the default functions of exportfs. - */ + get_page(page); -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, -}; + buffer = kmap(page); -#endif + obj = yaffs_inode_to_obj(inode); + dev = obj->my_dev; + yaffs_gross_lock(dev); -/*-----------------------------------------------------------------*/ -/* Directory search context allows us to unlock access to yaffs during - * filldir without causing problems with the directory being modified. - * This is similar to the tried and tested mechanism used in yaffs direct. - * - * A search context iterates along a doubly linked list of siblings in the - * directory. If the iterating object is deleted then this would corrupt - * the list iteration, likely causing a crash. The search context avoids - * this by using the remove_obj_fn to move the search context to the - * next object before the object is deleted. - * - * Many readdirs (and thus seach conexts) may be alive simulateously so - * each struct yaffs_dev has a list of these. - * - * A seach context lives for the duration of a readdir. - * - * All these functions must be called while yaffs is locked. - */ + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_writepage at %lld, size %08x", + ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes); + yaffs_trace(YAFFS_TRACE_OS, + "writepag0: obj = %lld, ino = %lld", + obj->variant.file_variant.file_size, inode->i_size); -struct yaffs_search_context { - struct yaffs_dev *dev; - struct yaffs_obj *dir_obj; - struct yaffs_obj *next_return; - struct list_head others; -}; + n_written = yaffs_wr_file(obj, buffer, + ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes, 0); -/* - * yaffs_new_search() creates a new search context, initialises it and - * adds it to the device's search context list. - * - * Called at start of readdir. - */ -static struct yaffs_search_context *yaffs_new_search(struct yaffs_obj *dir) -{ - struct yaffs_dev *dev = dir->my_dev; - struct yaffs_search_context *sc = - kmalloc(sizeof(struct yaffs_search_context), GFP_NOFS); - if (sc) { - sc->dir_obj = dir; - sc->dev = dev; - if (list_empty(&sc->dir_obj->variant.dir_variant.children)) - sc->next_return = NULL; - else - sc->next_return = - list_entry(dir->variant.dir_variant.children.next, - struct yaffs_obj, siblings); - INIT_LIST_HEAD(&sc->others); - list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts)); - } - return sc; -} + yaffs_set_super_dirty(dev); -/* - * yaffs_search_end() disposes of a search context and cleans up. - */ -static void yaffs_search_end(struct yaffs_search_context *sc) -{ - if (sc) { - list_del(&sc->others); - kfree(sc); - } -} + yaffs_trace(YAFFS_TRACE_OS, + "writepag1: obj = %lld, ino = %lld", + obj->variant.file_variant.file_size, inode->i_size); -/* - * yaffs_search_advance() moves a search context to the next object. - * Called when the search iterates or when an object removal causes - * the search context to be moved to the next object. - */ -static void yaffs_search_advance(struct yaffs_search_context *sc) -{ - if (!sc) - return; + yaffs_gross_unlock(dev); - if (sc->next_return == NULL || - list_empty(&sc->dir_obj->variant.dir_variant.children)) - sc->next_return = NULL; - else { - struct list_head *next = sc->next_return->siblings.next; + kunmap(page); + set_page_writeback(page); + unlock_page(page); + end_page_writeback(page); + put_page(page); - if (next == &sc->dir_obj->variant.dir_variant.children) - sc->next_return = NULL; /* end of list */ - else - sc->next_return = - list_entry(next, struct yaffs_obj, siblings); - } + return (n_written == n_bytes) ? 0 : -ENOSPC; } -/* - * yaffs_remove_obj_callback() is called when an object is unlinked. - * We check open search contexts and advance any which are currently - * on the object being iterated. - */ -static void yaffs_remove_obj_callback(struct yaffs_obj *obj) -{ - - struct list_head *i; - struct yaffs_search_context *sc; - struct list_head *search_contexts = - &(yaffs_dev_to_lc(obj->my_dev)->search_contexts); - - /* Iterate through the directory search contexts. - * If any are currently on the object being removed, then advance - * the search context to the next object to prevent a hanging pointer. - */ - list_for_each(i, search_contexts) { - sc = list_entry(i, struct yaffs_search_context, others); - if (sc->next_return == obj) - yaffs_search_advance(sc); - } +/* 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) +{ + struct yaffs_obj *obj; + struct yaffs_dev *dev; -/*-----------------------------------------------------------------*/ + int n_free_chunks; -static int yaffs_readlink(struct dentry *dentry, char __user * buffer, - int buflen) -{ - unsigned char *alias; - int ret; + obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); - struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; + dev = obj->my_dev; yaffs_gross_lock(dev); - alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); + n_free_chunks = yaffs_get_n_free_chunks(dev); yaffs_gross_unlock(dev); - if (!alias) - return -ENOMEM; - - ret = vfs_readlink(dentry, buffer, buflen, alias); - kfree(alias); - return ret; + return (n_free_chunks > 20) ? 1 : 0; } -#if (YAFFS_NEW_FOLLOW_LINK == 1) -static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) -{ - void *ret; -#else -static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) +static void yaffs_release_space(struct file *f) { - int ret -#endif - unsigned char *alias; - int ret_int = 0; - struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; + struct yaffs_obj *obj; + struct yaffs_dev *dev; + + obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); + + dev = obj->my_dev; yaffs_gross_lock(dev); - alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); yaffs_gross_unlock(dev); - - if (!alias) { - ret_int = -ENOMEM; - goto out; - } -#if (YAFFS_NEW_FOLLOW_LINK == 1) - nd_set_link(nd, alias); - ret = alias; -out: - if (ret_int) - ret = ERR_PTR(ret_int); - return ret; -#else - ret = vfs_follow_link(nd, alias); - kfree(alias); -out: - if (ret_int) - ret = ret_int; - return ret; -#endif } -#if (YAFFS_NEW_FOLLOW_LINK == 1) -void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias) +#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) { - kfree(alias); -} -#endif - -struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, - struct yaffs_obj *obj); + struct page *pg = NULL; + pgoff_t index = pos >> PAGE_CACHE_SHIFT; -/* - * Lookup is used to find objects in the fs - */ -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + int ret = 0; + int space_held = 0; -static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, - struct nameidata *n) + /* Get a page */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) + pg = grab_cache_page_write_begin(mapping, index, flags); #else -static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) + pg = __grab_cache_page(mapping, index); #endif -{ - struct yaffs_obj *obj; - struct inode *inode = NULL; /* NCB 2.5/2.6 needs NULL here */ - struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev; + *pagep = pg; + if (!pg) { + ret = -ENOMEM; + goto out; + } + yaffs_trace(YAFFS_TRACE_OS, + "start yaffs_write_begin index %d(%x) uptodate %d", + (int)index, (int)index, Page_Uptodate(pg) ? 1 : 0); - if (current != yaffs_dev_to_lc(dev)->readdir_process) - yaffs_gross_lock(dev); + /* Get fs space */ + space_held = yaffs_hold_space(filp); - yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup for %d:%s", - yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name); + if (!space_held) { + ret = -ENOSPC; + goto out; + } - obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name); + /* Update page if required */ - obj = yaffs_get_equivalent_obj(obj); /* in case it was a hardlink */ + if (!Page_Uptodate(pg)) + ret = yaffs_readpage_nolock(filp, pg); - /* Can't hold gross lock when calling yaffs_get_inode() */ - if (current != yaffs_dev_to_lc(dev)->readdir_process) - yaffs_gross_unlock(dev); + if (ret) + goto out; - if (obj) { - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_lookup found %d", obj->obj_id); + /* Happy path return */ + yaffs_trace(YAFFS_TRACE_OS, "end yaffs_write_begin - ok"); - inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj); - } else { - yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup not found"); + return 0; +out: + yaffs_trace(YAFFS_TRACE_OS, + "end yaffs_write_begin fail returning %d", ret); + if (space_held) + yaffs_release_space(filp); + if (pg) { + unlock_page(pg); + page_cache_release(pg); } - -/* added NCB for 2.5/6 compatability - forces add even if inode is - * NULL which creates dentry hash */ - d_add(dentry, inode); - - return NULL; + return ret; } -#ifdef YAFFS_HAS_PUT_INODE +#else -/* For now put inode is just for debugging - * Put inode is called when the inode **structure** is put. - */ -static void yaffs_put_inode(struct inode *inode) +static int yaffs_prepare_write(struct file *f, struct page *pg, + unsigned offset, unsigned to) { - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_put_inode: ino %d, count %d"), - (int)inode->i_ino, atomic_read(&inode->i_count); + yaffs_trace(YAFFS_TRACE_OS, "yaffs_prepair_write"); + if (!Page_Uptodate(pg)) + return yaffs_readpage_nolock(f, pg); + return 0; } #endif -static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj) -{ - /* Clear the association between the inode and - * the struct yaffs_obj. - */ - obj->my_inode = NULL; - yaffs_inode_to_obj_lv(inode) = NULL; - - /* If the object freeing was deferred, then the real - * free happens now. - * This should fix the inode inconsistency problem. - */ - yaffs_handle_defered_free(obj); -} -#ifdef YAFFS_HAS_EVICT_INODE -/* yaffs_evict_inode combines into one operation what was previously done in - * yaffs_clear_inode() and yaffs_delete_inode() - * - */ -static void yaffs_evict_inode(struct inode *inode) +static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, + loff_t * pos) { struct yaffs_obj *obj; + int n_written; + loff_t ipos; + struct inode *inode; struct yaffs_dev *dev; - int deleteme = 0; - obj = yaffs_inode_to_obj(inode); + obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); + + if (!obj) { + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_file_write: hey obj is null!"); + return -EINVAL; + } + + dev = obj->my_dev; + + yaffs_gross_lock(dev); + + inode = Y_GET_DENTRY(f)->d_inode; + + if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) + ipos = inode->i_size; + else + ipos = *pos; yaffs_trace(YAFFS_TRACE_OS, - "yaffs_evict_inode: ino %d, count %d %s", - (int)inode->i_ino, atomic_read(&inode->i_count), - obj ? "object exists" : "null object"); + "yaffs_file_write about to write writing %u(%x) bytes to object %d at %lld", + (unsigned)n, (unsigned)n, obj->obj_id, ipos); - if (!inode->i_nlink && !is_bad_inode(inode)) - deleteme = 1; - truncate_inode_pages(&inode->i_data, 0); - end_writeback(inode); + n_written = yaffs_wr_file(obj, buf, ipos, n, 0); + + yaffs_set_super_dirty(dev); + + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_file_write: %d(%x) bytes written", + (unsigned)n, (unsigned)n); + + if (n_written > 0) { + ipos += n_written; + *pos = ipos; + if (ipos > inode->i_size) { + inode->i_size = ipos; + inode->i_blocks = (ipos + 511) >> 9; + + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_file_write size updated to %lld bytes, %d blocks", + ipos, (int)(inode->i_blocks)); + } - if (deleteme && obj) { - dev = obj->my_dev; - yaffs_gross_lock(dev); - yaffs_del_obj(obj); - yaffs_gross_unlock(dev); - } - if (obj) { - dev = obj->my_dev; - yaffs_gross_lock(dev); - yaffs_unstitch_obj(inode, obj); - yaffs_gross_unlock(dev); } + yaffs_gross_unlock(dev); + return (n_written == 0) && (n > 0) ? -ENOSPC : n_written; } -#else -/* clear is called to tell the fs to release any per-inode data it holds. - * The object might still exist on disk and is just being thrown out of the cache - * or else the object has actually been deleted and we're being called via - * the chain - * yaffs_delete_inode() -> clear_inode()->yaffs_clear_inode() - */ -static void yaffs_clear_inode(struct inode *inode) +#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) { - struct yaffs_obj *obj; - struct yaffs_dev *dev; + int ret = 0; + void *addr, *kva; + uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1); - obj = yaffs_inode_to_obj(inode); + kva = kmap(pg); + addr = kva + offset_into_page; yaffs_trace(YAFFS_TRACE_OS, - "yaffs_clear_inode: ino %d, count %d %s", - (int)inode->i_ino, atomic_read(&inode->i_count), - obj ? "object exists" : "null object"); + "yaffs_write_end addr %p pos %lld n_bytes %d", + addr, pos, copied); - if (obj) { - dev = obj->my_dev; - yaffs_gross_lock(dev); - yaffs_unstitch_obj(inode, obj); - yaffs_gross_unlock(dev); + ret = yaffs_file_write(filp, addr, copied, &pos); + + if (ret != copied) { + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_write_end not same size ret %d copied %d", + ret, copied); + SetPageError(pg); } -} + kunmap(pg); -/* delete is called when the link count is zero and the inode - * is put (ie. nobody wants to know about it anymore, time to - * delete the file). - * NB Must call clear_inode() - */ -static void yaffs_delete_inode(struct inode *inode) + 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) { - struct yaffs_obj *obj = yaffs_inode_to_obj(inode); - struct yaffs_dev *dev; + void *addr, *kva; + + loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset; + int n_bytes = to - offset; + int n_written; + + kva = kmap(pg); + addr = kva + offset; yaffs_trace(YAFFS_TRACE_OS, - "yaffs_delete_inode: ino %d, count %d %s", - (int)inode->i_ino, atomic_read(&inode->i_count), - obj ? "object exists" : "null object"); + "yaffs_commit_write addr %p pos %lld n_bytes %d", + addr, pos, n_bytes); - if (obj) { - dev = obj->my_dev; - yaffs_gross_lock(dev); - yaffs_del_obj(obj); - yaffs_gross_unlock(dev); + n_written = yaffs_file_write(f, addr, n_bytes, &pos); + + if (n_written != n_bytes) { + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_commit_write not same size n_written %d n_bytes %d", + n_written, n_bytes); + SetPageError(pg); } -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13)) - truncate_inode_pages(&inode->i_data, 0); -#endif - clear_inode(inode); + kunmap(pg); + + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_commit_write returning %d", + n_written == n_bytes ? 0 : n_written); + + return n_written == n_bytes ? 0 : n_written; } #endif +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, 17)) static int yaffs_file_flush(struct file *file, fl_owner_t id) #else static int yaffs_file_flush(struct file *file) #endif { - struct yaffs_obj *obj = yaffs_dentry_to_obj(file->f_dentry); + struct yaffs_obj *obj = yaffs_dentry_to_obj(Y_GET_DENTRY(file)); struct yaffs_dev *dev = obj->my_dev; @@ -962,417 +773,503 @@ static int yaffs_file_flush(struct file *file) yaffs_gross_lock(dev); - yaffs_flush_file(obj, 1, 0); + yaffs_flush_file(obj, 1, 0, 0); yaffs_gross_unlock(dev); return 0; } -static int yaffs_readpage_nolock(struct file *f, struct page *pg) -{ - /* Lifted from jffs2 */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) +static int yaffs_sync_object(struct file *file, loff_t start, loff_t end, int datasync) +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)) +static int yaffs_sync_object(struct file *file, int datasync) +#else +static int yaffs_sync_object(struct file *file, struct dentry *dentry, + int datasync) +#endif +{ struct yaffs_obj *obj; - unsigned char *pg_buf; - int ret; - loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT; struct yaffs_dev *dev; +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)) + struct dentry *dentry = file->f_path.dentry; +#endif - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_readpage_nolock at %lld, size %08x", - (long long)pos, - (unsigned)PAGE_CACHE_SIZE); - - obj = yaffs_dentry_to_obj(f->f_dentry); + obj = yaffs_dentry_to_obj(dentry); dev = obj->my_dev; -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) - BUG_ON(!PageLocked(pg)); + yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, + "yaffs_sync_object"); + yaffs_gross_lock(dev); + yaffs_flush_file(obj, 1, datasync, 0); + yaffs_gross_unlock(dev); + return 0; +} + + +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22)) +static const struct file_operations yaffs_file_operations = { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) + .read = new_sync_read, + .write = new_sync_write, +#endif + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, #else - if (!PageLocked(pg)) - PAGE_BUG(pg); + .read = do_sync_read, + .write = do_sync_write, + .aio_read = generic_file_aio_read, + .aio_write = generic_file_aio_write, #endif + .mmap = generic_file_mmap, + .flush = yaffs_file_flush, + .fsync = yaffs_sync_object, + .splice_read = generic_file_splice_read, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) + .splice_write = iter_file_splice_write, +#else + .splice_write = generic_file_splice_write, +#endif + .llseek = generic_file_llseek, +}; - pg_buf = kmap(pg); - /* FIXME: Can kmap fail? */ - - yaffs_gross_lock(dev); +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18)) - ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE); +static const struct file_operations yaffs_file_operations = { + .read = do_sync_read, + .write = do_sync_write, + .aio_read = generic_file_aio_read, + .aio_write = generic_file_aio_write, + .mmap = generic_file_mmap, + .flush = yaffs_file_flush, + .fsync = yaffs_sync_object, + .sendfile = generic_file_sendfile, +}; - yaffs_gross_unlock(dev); +#else - if (ret >= 0) - ret = 0; +static const struct file_operations yaffs_file_operations = { + .read = generic_file_read, + .write = generic_file_write, + .mmap = generic_file_mmap, + .flush = yaffs_file_flush, + .fsync = yaffs_sync_object, +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + .sendfile = generic_file_sendfile, +#endif +}; +#endif - if (ret) { - ClearPageUptodate(pg); - SetPageError(pg); - } else { - SetPageUptodate(pg); - ClearPageError(pg); - } - flush_dcache_page(pg); - kunmap(pg); - yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage_nolock done"); - return ret; -} -static int yaffs_readpage_unlock(struct file *f, struct page *pg) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)) +static void zero_user_segment(struct page *page, unsigned start, unsigned end) { - int ret = yaffs_readpage_nolock(f, pg); - UnlockPage(pg); - return ret; + void *kaddr = kmap_atomic(page, KM_USER0); + memset(kaddr + start, 0, end - start); + kunmap_atomic(kaddr, KM_USER0); + flush_dcache_page(page); } +#endif -static int yaffs_readpage(struct file *f, struct page *pg) + +static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize) { - int ret; +#ifdef YAFFS_USE_TRUNCATE_SETSIZE + truncate_setsize(inode, newsize); + return 0; +#else + truncate_inode_pages(&inode->i_data, newsize); + return 0; +#endif - yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage"); - ret = yaffs_readpage_unlock(f, pg); - yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done"); - return ret; } -/* writepage inspired by/stolen from smbfs */ -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -static int yaffs_writepage(struct page *page, struct writeback_control *wbc) +static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) +{ +#ifdef YAFFS_USE_SETATTR_COPY + setattr_copy(inode, attr); + return 0; #else -static int yaffs_writepage(struct page *page) + return inode_setattr(inode, attr); #endif -{ - struct yaffs_dev *dev; - struct address_space *mapping = page->mapping; - struct inode *inode; - unsigned long end_index; - char *buffer; - struct yaffs_obj *obj; - int n_written = 0; - unsigned n_bytes; - loff_t i_size; - if (!mapping) - BUG(); - inode = mapping->host; - if (!inode) - BUG(); - i_size = i_size_read(inode); +} - end_index = i_size >> PAGE_CACHE_SHIFT; +static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) +{ + struct inode *inode = dentry->d_inode; + int error = 0; + struct yaffs_dev *dev; - if (page->index < end_index) - n_bytes = PAGE_CACHE_SIZE; - else { - n_bytes = i_size & (PAGE_CACHE_SIZE - 1); + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_setattr of object %d", + yaffs_inode_to_obj(inode)->obj_id); +#if 0 + /* Fail if a requested resize >= 2GB */ + if (attr->ia_valid & ATTR_SIZE && (attr->ia_size >> 31)) + error = -EINVAL; +#endif - if (page->index > end_index || !n_bytes) { - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_writepage at %lld, inode size = %lld!!", - ((loff_t)page->index) << PAGE_CACHE_SHIFT, - inode->i_size); + if (error == 0) + error = setattr_prepare(dentry, attr); + if (error == 0) { + int result; + if (!error) { + error = yaffs_vfs_setattr(inode, attr); + yaffs_trace(YAFFS_TRACE_OS, "inode_setattr called"); + if (attr->ia_valid & ATTR_SIZE) { + yaffs_vfs_setsize(inode, attr->ia_size); + inode->i_blocks = (inode->i_size + 511) >> 9; + } + } + dev = yaffs_inode_to_obj(inode)->my_dev; + if (attr->ia_valid & ATTR_SIZE) { yaffs_trace(YAFFS_TRACE_OS, - " -> don't care!!"); - - zero_user_segment(page, 0, PAGE_CACHE_SIZE); - set_page_writeback(page); - unlock_page(page); - end_page_writeback(page); - return 0; + "resize to %d(%x)", + (int)(attr->ia_size), + (int)(attr->ia_size)); } - } - - if (n_bytes != PAGE_CACHE_SIZE) - zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE); - - get_page(page); - - buffer = kmap(page); + yaffs_gross_lock(dev); + result = yaffs_set_attribs(yaffs_inode_to_obj(inode), attr); + if (result == YAFFS_OK) { + error = 0; + } else { + error = -EPERM; + } + yaffs_gross_unlock(dev); - obj = yaffs_inode_to_obj(inode); - dev = obj->my_dev; - yaffs_gross_lock(dev); + } - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_writepage at %lld, size %08x", - ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes); - yaffs_trace(YAFFS_TRACE_OS, - "writepag0: obj = %lld, ino = %lld", - obj->variant.file_variant.file_size, inode->i_size); + yaffs_trace(YAFFS_TRACE_OS, "yaffs_setattr done returning %d", error); - n_written = yaffs_wr_file(obj, buffer, - ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes, 0); + return error; +} - yaffs_touch_super(dev); +#ifdef YAFFS_USE_XATTR +#if (YAFFS_NEW_XATTR > 0) +static int yaffs_setxattr(struct dentry *dentry, struct inode *inode, + const char *name, const void *value, size_t size, int flags) +{ +#else +static int yaffs_setxattr(struct dentry *dentry, const char *name, + const void *value, size_t size, int flags) +{ + struct inode *inode = dentry->d_inode; +#endif + int error = 0; + struct yaffs_dev *dev; + struct yaffs_obj *obj = yaffs_inode_to_obj(inode); - yaffs_trace(YAFFS_TRACE_OS, - "writepag1: obj = %lld, ino = %lld", - obj->variant.file_variant.file_size, inode->i_size); + yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id); - yaffs_gross_unlock(dev); + if (error == 0) { + int result; + dev = obj->my_dev; + yaffs_gross_lock(dev); + result = yaffs_set_xattrib(obj, name, value, size, flags); + if (result == YAFFS_OK) + error = 0; + else if (result < 0) + error = result; + yaffs_gross_unlock(dev); - kunmap(page); - set_page_writeback(page); - unlock_page(page); - end_page_writeback(page); - put_page(page); + } + yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr done returning %d", error); - return (n_written == n_bytes) ? 0 : -ENOSPC; + return error; } -#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) +#if (YAFFS_NEW_XATTR > 0) +static ssize_t yaffs_getxattr(struct dentry * dentry, struct inode *inode, + const char *name, void *buff, size_t size) { - struct page *pg = NULL; - pgoff_t index = pos >> PAGE_CACHE_SHIFT; - - int ret = 0; - int space_held = 0; - - /* 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); +static ssize_t yaffs_getxattr(struct dentry * dentry, const char *name, + void *buff, size_t size) +{ + struct inode *inode = dentry->d_inode; #endif + int error = 0; + struct yaffs_dev *dev; + struct yaffs_obj *obj = yaffs_inode_to_obj(inode); - *pagep = pg; - if (!pg) { - ret = -ENOMEM; - goto out; - } yaffs_trace(YAFFS_TRACE_OS, - "start yaffs_write_begin index %d(%x) uptodate %d", - (int)index, (int)index, Page_Uptodate(pg) ? 1 : 0); + "yaffs_getxattr \"%s\" from object %d", + name, obj->obj_id); - /* Get fs space */ - space_held = yaffs_hold_space(filp); + if (error == 0) { + dev = obj->my_dev; + yaffs_gross_lock(dev); + error = yaffs_get_xattrib(obj, name, buff, size); + yaffs_gross_unlock(dev); - if (!space_held) { - ret = -ENOSPC; - goto out; } + yaffs_trace(YAFFS_TRACE_OS, "yaffs_getxattr done returning %d", error); - /* Update page if required */ - - if (!Page_Uptodate(pg)) - ret = yaffs_readpage_nolock(filp, pg); - - if (ret) - goto out; - - /* Happy path return */ - yaffs_trace(YAFFS_TRACE_OS, "end yaffs_write_begin - ok"); + return error; +} - return 0; +static int yaffs_removexattr(struct dentry *dentry, const char *name) +{ + struct inode *inode = dentry->d_inode; + int error = 0; + struct yaffs_dev *dev; + struct yaffs_obj *obj = yaffs_inode_to_obj(inode); -out: yaffs_trace(YAFFS_TRACE_OS, - "end yaffs_write_begin fail returning %d", ret); - if (space_held) - yaffs_release_space(filp); - if (pg) { - unlock_page(pg); - page_cache_release(pg); - } - return ret; -} + "yaffs_removexattr of object %d", obj->obj_id); -#else + if (error == 0) { + int result; + dev = obj->my_dev; + yaffs_gross_lock(dev); + result = yaffs_remove_xattrib(obj, name); + if (result == YAFFS_OK) + error = 0; + else if (result < 0) + error = result; + yaffs_gross_unlock(dev); -static int yaffs_prepare_write(struct file *f, struct page *pg, - unsigned offset, unsigned to) -{ - yaffs_trace(YAFFS_TRACE_OS, "yaffs_prepair_write"); + } + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_removexattr done returning %d", error); - if (!Page_Uptodate(pg)) - return yaffs_readpage_nolock(f, pg); - return 0; + return error; } #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) +static ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size) { - int ret = 0; - void *addr, *kva; - uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1); - - kva = kmap(pg); - addr = kva + offset_into_page; + struct inode *inode = dentry->d_inode; + int error = 0; + struct yaffs_dev *dev; + struct yaffs_obj *obj = yaffs_inode_to_obj(inode); yaffs_trace(YAFFS_TRACE_OS, - "yaffs_write_end addr %p pos %lld n_bytes %d", - addr, pos, copied); + "yaffs_listxattr of object %d", obj->obj_id); - ret = yaffs_file_write(filp, addr, copied, &pos); + if (error == 0) { + dev = obj->my_dev; + yaffs_gross_lock(dev); + error = yaffs_list_xattrib(obj, buff, size); + yaffs_gross_unlock(dev); - if (ret != copied) { - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_write_end not same size ret %d copied %d", - ret, copied); - SetPageError(pg); } + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_listxattr done returning %d", error); - kunmap(pg); - - yaffs_release_space(filp); - unlock_page(pg); - page_cache_release(pg); - return ret; + return error; } -#else -static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, - unsigned to) -{ - void *addr, *kva; - loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset; - int n_bytes = to - offset; - int n_written; +static const struct inode_operations yaffs_file_inode_operations = { + .setattr = yaffs_setattr, +#ifdef YAFFS_USE_XATTR + .setxattr = yaffs_setxattr, + .getxattr = yaffs_getxattr, + .removexattr = yaffs_removexattr, +#endif + .listxattr = yaffs_listxattr, +}; - kva = kmap(pg); - addr = kva + offset; - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_commit_write addr %p pos %lld n_bytes %d", - addr, pos, n_bytes); +static int yaffs_readlink(struct dentry *dentry, char __user * buffer, + int buflen) +{ + unsigned char *alias; + int ret; - n_written = yaffs_file_write(f, addr, n_bytes, &pos); + struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; - if (n_written != n_bytes) { - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_commit_write not same size n_written %d n_bytes %d", - n_written, n_bytes); - SetPageError(pg); - } - kunmap(pg); + yaffs_gross_lock(dev); - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_commit_write returning %d", - n_written == n_bytes ? 0 : n_written); + alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); - return n_written == n_bytes ? 0 : n_written; -} + yaffs_gross_unlock(dev); + + if (!alias) + return -ENOMEM; + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) + ret = vfs_readlink(dentry, buffer, buflen, alias); +#else + ret = readlink_copy(buffer, buflen, alias); #endif + kfree(alias); + return ret; +} -static void yaffs_fill_inode_from_obj(struct inode *inode, - struct yaffs_obj *obj) +#if (YAFFS_NEW_GET_LINK == 0) +#if (YAFFS_NEW_FOLLOW_LINK == 1) +static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) { - if (inode && obj) { - - /* Check mode against the variant type and attempt to repair if broken. */ - u32 mode = obj->yst_mode; - switch (obj->variant_type) { - case YAFFS_OBJECT_TYPE_FILE: - if (!S_ISREG(mode)) { - obj->yst_mode &= ~S_IFMT; - obj->yst_mode |= S_IFREG; - } + void *ret; +#else +static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) +{ + int ret +#endif + unsigned char *alias; + int ret_int = 0; + struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; - break; - case YAFFS_OBJECT_TYPE_SYMLINK: - if (!S_ISLNK(mode)) { - obj->yst_mode &= ~S_IFMT; - obj->yst_mode |= S_IFLNK; - } + yaffs_gross_lock(dev); - break; - case YAFFS_OBJECT_TYPE_DIRECTORY: - if (!S_ISDIR(mode)) { - obj->yst_mode &= ~S_IFMT; - obj->yst_mode |= S_IFDIR; - } + alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); + yaffs_gross_unlock(dev); - break; - case YAFFS_OBJECT_TYPE_UNKNOWN: - case YAFFS_OBJECT_TYPE_HARDLINK: - case YAFFS_OBJECT_TYPE_SPECIAL: - default: - /* TODO? */ - break; - } + if (!alias) { + ret_int = -ENOMEM; + goto out; + } +#if (YAFFS_NEW_FOLLOW_LINK == 1) + nd_set_link(nd, alias); + ret = alias; +out: + if (ret_int) + ret = ERR_PTR(ret_int); + return ret; +#else + ret = vfs_follow_link(nd, alias); + kfree(alias); +out: + if (ret_int) + ret = ret_int; + return ret; +#endif +} +#else +static const char *yaffs_get_link(struct dentry *dentry, struct inode *inode, struct delayed_call *done) +{ + unsigned char *alias; + struct yaffs_dev *dev; - inode->i_flags |= S_NOATIME; + if (!dentry) + return ERR_PTR(-ECHILD); - inode->i_ino = obj->obj_id; - inode->i_mode = obj->yst_mode; - inode->i_uid = obj->yst_uid; - inode->i_gid = obj->yst_gid; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) - inode->i_blksize = inode->i_sb->s_blocksize; + dev = yaffs_dentry_to_obj(dentry)->my_dev; + + yaffs_gross_lock(dev); + + alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); + yaffs_gross_unlock(dev); + + if (!alias) + return ERR_PTR(-ENOMEM); + set_delayed_call(done, kfree_link, alias); + return alias; +} #endif -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) - inode->i_rdev = old_decode_dev(obj->yst_rdev); - inode->i_atime.tv_sec = (time_t) (obj->yst_atime); - inode->i_atime.tv_nsec = 0; - inode->i_mtime.tv_sec = (time_t) obj->yst_mtime; - inode->i_mtime.tv_nsec = 0; - inode->i_ctime.tv_sec = (time_t) obj->yst_ctime; - inode->i_ctime.tv_nsec = 0; +#ifdef YAFFS_HAS_PUT_INODE + +/* For now put inode is just for debugging + * Put inode is called when the inode **structure** is put. + */ +static void yaffs_put_inode(struct inode *inode) +{ + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_put_inode: ino %d, count %d"), + (int)inode->i_ino, atomic_read(&inode->i_count); + +} +#endif + +#if (YAFFS_NEW_FOLLOW_LINK == 1) +void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias) +{ + kfree(alias); +} +#endif + +static const struct inode_operations yaffs_symlink_inode_operations = { + .readlink = yaffs_readlink, +#if (YAFFS_NEW_GET_LINK == 1) + .get_link = yaffs_get_link, #else - inode->i_rdev = obj->yst_rdev; - inode->i_atime = obj->yst_atime; - inode->i_mtime = obj->yst_mtime; - inode->i_ctime = obj->yst_ctime; + .follow_link = yaffs_follow_link, #endif - inode->i_size = yaffs_get_obj_length(obj); - inode->i_blocks = (inode->i_size + 511) >> 9; +#if (YAFFS_NEW_FOLLOW_LINK == 1) + .put_link = yaffs_put_link, +#endif + .setattr = yaffs_setattr, +#ifdef YAFFS_USE_XATTR + .setxattr = yaffs_setxattr, + .getxattr = yaffs_getxattr, + .removexattr = yaffs_removexattr, +#endif + .listxattr = yaffs_listxattr, +}; - set_nlink(inode, yaffs_get_obj_link_count(obj)); +#ifdef YAFFS_USE_OWN_IGET - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_fill_inode mode %x uid %d gid %d size %lld count %d", - inode->i_mode, inode->i_uid, inode->i_gid, - inode->i_size, atomic_read(&inode->i_count)); +static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino) +{ + struct inode *inode; + struct yaffs_obj *obj; + struct yaffs_dev *dev = yaffs_super_to_dev(sb); + + yaffs_trace(YAFFS_TRACE_OS, "yaffs_iget for %lu", ino); + + inode = iget_locked(sb, ino); + if (!inode) + return ERR_PTR(-ENOMEM); + if (!(inode->i_state & I_NEW)) + return inode; + + /* NB This is called as a side effect of other functions, but + * we had to release the lock to prevent deadlocks, so + * need to lock again. + */ + + yaffs_gross_lock(dev); + + obj = yaffs_find_by_number(dev, inode->i_ino); + + yaffs_fill_inode_from_obj(inode, obj); + + yaffs_gross_unlock(dev); + + unlock_new_inode(inode); + return inode; +} - switch (obj->yst_mode & S_IFMT) { - default: /* fifo, device or socket */ -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) - init_special_inode(inode, obj->yst_mode, - old_decode_dev(obj->yst_rdev)); #else - init_special_inode(inode, obj->yst_mode, - (dev_t) (obj->yst_rdev)); -#endif - break; - case S_IFREG: /* file */ - inode->i_op = &yaffs_file_inode_operations; - inode->i_fop = &yaffs_file_operations; - inode->i_mapping->a_ops = - &yaffs_file_address_operations; - break; - case S_IFDIR: /* directory */ - inode->i_op = &yaffs_dir_inode_operations; - inode->i_fop = &yaffs_dir_operations; - break; - case S_IFLNK: /* symlink */ - inode->i_op = &yaffs_symlink_inode_operations; - break; - } - yaffs_inode_to_obj_lv(inode) = obj; +static void yaffs_read_inode(struct inode *inode) +{ + /* NB This is called as a side effect of other functions, but + * we had to release the lock to prevent deadlocks, so + * need to lock again. + */ - obj->my_inode = inode; + struct yaffs_obj *obj; + struct yaffs_dev *dev = yaffs_super_to_dev(inode->i_sb); - } else { - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_fill_inode invalid parameters"); - } + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_read_inode for %d", (int)inode->i_ino); + + if (current != yaffs_dev_to_lc(dev)->readdir_process) + yaffs_gross_lock(dev); + obj = yaffs_find_by_number(dev, inode->i_ino); + + yaffs_fill_inode_from_obj(inode, obj); + + if (current != yaffs_dev_to_lc(dev)->readdir_process) + yaffs_gross_unlock(dev); } +#endif + + + struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, struct yaffs_obj *obj) { @@ -1406,237 +1303,53 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, return inode; } -static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, - loff_t * pos) -{ - struct yaffs_obj *obj; - int n_written; - loff_t ipos; - struct inode *inode; - struct yaffs_dev *dev; - - obj = yaffs_dentry_to_obj(f->f_dentry); - if (!obj) { - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_file_write: hey obj is null!"); - return -EINVAL; - } - dev = obj->my_dev; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) +#define YCRED(x) x +#else +#define YCRED(x) (x->cred) +#endif - yaffs_gross_lock(dev); +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) +#define YPROC_uid(p) (YCRED(p)->fsuid) +#define YPROC_gid(p) (YCRED(p)->fsgid) +#define EXTRACT_gid(x) x +#define EXTRACT_uid(x) x +#define MAKE_gid(x) x +#define MAKE_uid(x) x +#else +#define YPROC_uid(p) from_kuid(&init_user_ns, YCRED(p)->fsuid) +#define YPROC_gid(p) from_kgid(&init_user_ns, YCRED(p)->fsgid) +#define EXTRACT_gid(x) from_kgid(&init_user_ns, x) +#define EXTRACT_uid(x) from_kuid(&init_user_ns, x) +#define MAKE_gid(x) make_kgid(&init_user_ns, x) +#define MAKE_uid(x) make_kuid(&init_user_ns, x) +#endif - inode = f->f_dentry->d_inode; - if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) - ipos = inode->i_size; - else - ipos = *pos; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) +static int yaffs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, + dev_t rdev) +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) +static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, + dev_t rdev) +#else +static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, + int rdev) +#endif +{ + struct inode *inode; - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_file_write about to write writing %u(%x) bytes to object %d at %lld", - (unsigned)n, (unsigned)n, obj->obj_id, ipos); + struct yaffs_obj *obj = NULL; + struct yaffs_dev *dev; - n_written = yaffs_wr_file(obj, buf, ipos, n, 0); + struct yaffs_obj *parent = yaffs_inode_to_obj(dir); - yaffs_touch_super(dev); - - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_file_write: %d(%x) bytes written", - (unsigned)n, (unsigned)n); - - if (n_written > 0) { - ipos += n_written; - *pos = ipos; - if (ipos > inode->i_size) { - inode->i_size = ipos; - inode->i_blocks = (ipos + 511) >> 9; - - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_file_write size updated to %lld bytes, %d blocks", - ipos, (int)(inode->i_blocks)); - } - - } - yaffs_gross_unlock(dev); - return (n_written == 0) && (n > 0) ? -ENOSPC : n_written; -} - -/* 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) -{ - struct yaffs_obj *obj; - struct yaffs_dev *dev; - - int n_free_chunks; - - obj = yaffs_dentry_to_obj(f->f_dentry); - - dev = obj->my_dev; - - yaffs_gross_lock(dev); - - n_free_chunks = yaffs_get_n_free_chunks(dev); - - yaffs_gross_unlock(dev); - - return (n_free_chunks > 20) ? 1 : 0; -} - -static void yaffs_release_space(struct file *f) -{ - struct yaffs_obj *obj; - struct yaffs_dev *dev; - - obj = yaffs_dentry_to_obj(f->f_dentry); - - dev = obj->my_dev; - - yaffs_gross_lock(dev); - - yaffs_gross_unlock(dev); -} - -static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) -{ - struct yaffs_obj *obj; - struct yaffs_dev *dev; - struct yaffs_search_context *sc; - struct inode *inode = f->f_dentry->d_inode; - unsigned long offset, curoffs; - struct yaffs_obj *l; - int ret_val = 0; - - char name[YAFFS_MAX_NAME_LENGTH + 1]; - - obj = yaffs_dentry_to_obj(f->f_dentry); - dev = obj->my_dev; - - yaffs_gross_lock(dev); - - yaffs_dev_to_lc(dev)->readdir_process = current; - - offset = f->f_pos; - - sc = yaffs_new_search(obj); - if (!sc) { - ret_val = -ENOMEM; - goto out; - } - - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_readdir: starting at %d", (int)offset); - - if (offset == 0) { - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_readdir: entry . ino %d", - (int)inode->i_ino); - yaffs_gross_unlock(dev); - if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0) { - yaffs_gross_lock(dev); - goto out; - } - yaffs_gross_lock(dev); - offset++; - f->f_pos++; - } - if (offset == 1) { - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_readdir: entry .. ino %d", - (int)f->f_dentry->d_parent->d_inode->i_ino); - yaffs_gross_unlock(dev); - if (filldir(dirent, "..", 2, offset, - f->f_dentry->d_parent->d_inode->i_ino, - DT_DIR) < 0) { - yaffs_gross_lock(dev); - goto out; - } - yaffs_gross_lock(dev); - offset++; - f->f_pos++; - } - - curoffs = 1; - - /* 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; - f->f_version = inode->i_version; - } - - while (sc->next_return) { - curoffs++; - l = sc->next_return; - if (curoffs >= offset) { - int this_inode = yaffs_get_obj_inode(l); - int this_type = yaffs_get_obj_type(l); - - yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1); - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_readdir: %s inode %d", - name, yaffs_get_obj_inode(l)); - - yaffs_gross_unlock(dev); - - if (filldir(dirent, - name, - strlen(name), - offset, this_inode, this_type) < 0) { - yaffs_gross_lock(dev); - goto out; - } - - yaffs_gross_lock(dev); - - offset++; - f->f_pos++; - } - yaffs_search_advance(sc); - } - -out: - yaffs_search_end(sc); - yaffs_dev_to_lc(dev)->readdir_process = NULL; - yaffs_gross_unlock(dev); - - return ret_val; -} - -/* - * 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) -#else -static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, - int rdev) -#endif -{ - struct inode *inode; - - struct yaffs_obj *obj = NULL; - struct yaffs_dev *dev; - - struct yaffs_obj *parent = yaffs_inode_to_obj(dir); - - int error = -ENOSPC; - uid_t uid = YCRED(current)->fsuid; - gid_t gid = - (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid; + int error = -ENOSPC; + uid_t uid = YPROC_uid(current); + gid_t gid = + (dir->i_mode & S_ISGID) ? EXTRACT_gid(dir->i_gid) : YPROC_gid(current); if ((dir->i_mode & S_ISGID) && S_ISDIR(mode)) mode |= S_ISGID; @@ -1709,7 +1422,11 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, return error; } +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) +static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) +#else static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode) +#endif { int ret_val; yaffs_trace(YAFFS_TRACE_OS, "yaffs_mkdir"); @@ -1717,7 +1434,14 @@ static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode) return ret_val; } -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) +static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode, + bool dummy) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) +static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode, + struct nameidata *n) +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata *n) #else @@ -1728,31 +1452,50 @@ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode) return yaffs_mknod(dir, dentry, mode | S_IFREG, 0); } -static int yaffs_unlink(struct inode *dir, struct dentry *dentry) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) +static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, + unsigned int dummy) +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) +static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, + struct nameidata *n) +#else +static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) +#endif { - int ret_val; - - struct yaffs_dev *dev; struct yaffs_obj *obj; + struct inode *inode = NULL; /* NCB 2.5/2.6 needs NULL here */ - yaffs_trace(YAFFS_TRACE_OS, "yaffs_unlink %d:%s", - (int)(dir->i_ino), dentry->d_name.name); - obj = yaffs_inode_to_obj(dir); - dev = obj->my_dev; + struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev; - yaffs_gross_lock(dev); + if (current != yaffs_dev_to_lc(dev)->readdir_process) + yaffs_gross_lock(dev); - ret_val = yaffs_unlinker(obj, dentry->d_name.name); + yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup for %d:%s", + yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name); - if (ret_val == YAFFS_OK) { - inode_dec_link_count(dentry->d_inode); - dir->i_version++; + obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name); + + obj = yaffs_get_equivalent_obj(obj); /* in case it was a hardlink */ + + /* Can't hold gross lock when calling yaffs_get_inode() */ + if (current != yaffs_dev_to_lc(dev)->readdir_process) yaffs_gross_unlock(dev); - update_dir_time(dir); - return 0; + + if (obj) { + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_lookup found %d", obj->obj_id); + + inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj); + } else { + yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup not found"); + } - yaffs_gross_unlock(dev); - return -ENOTEMPTY; + +/* added NCB for 2.5/6 compatability - forces add even if inode is + * NULL which creates dentry hash */ + d_add(dentry, inode); + + return NULL; } /* @@ -1803,9 +1546,9 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry, { struct yaffs_obj *obj; struct yaffs_dev *dev; - uid_t uid = YCRED(current)->fsuid; + uid_t uid = YPROC_uid(current); gid_t gid = - (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid; + (dir->i_mode & S_ISGID) ? EXTRACT_gid(dir->i_gid) : YPROC_gid(current); yaffs_trace(YAFFS_TRACE_OS, "yaffs_symlink"); @@ -1838,41 +1581,18 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry, return -ENOMEM; } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) -static int yaffs_sync_object(struct file *file, loff_t start, loff_t end, int datasync) -#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)) -static int yaffs_sync_object(struct file *file, int datasync) +/* + * The VFS layer already does all the dentry stuff for rename. + * + * NB: POSIX says you can rename an object over an old object of the same name + */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) +static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, + struct inode *new_dir, struct dentry *new_dentry, unsigned int unused) #else -static int yaffs_sync_object(struct file *file, struct dentry *dentry, - int datasync) -#endif -{ - - struct yaffs_obj *obj; - struct yaffs_dev *dev; -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)) - struct dentry *dentry = file->f_path.dentry; -#endif - - obj = yaffs_dentry_to_obj(dentry); - - dev = obj->my_dev; - - yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, - "yaffs_sync_object"); - yaffs_gross_lock(dev); - yaffs_flush_file(obj, 1, datasync); - yaffs_gross_unlock(dev); - return 0; -} - -/* - * The VFS layer already does all the dentry stuff for rename. - * - * NB: POSIX says you can rename an object over an old object of the same name - */ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry) +#endif { struct yaffs_dev *dev; int ret_val = YAFFS_FAIL; @@ -1917,260 +1637,489 @@ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, } } -static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) -{ - struct inode *inode = dentry->d_inode; - int error = 0; - struct yaffs_dev *dev; - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_setattr of object %d", - yaffs_inode_to_obj(inode)->obj_id); -#if 0 - /* Fail if a requested resize >= 2GB */ - if (attr->ia_valid & ATTR_SIZE && (attr->ia_size >> 31)) - error = -EINVAL; -#endif - if (error == 0) - error = inode_change_ok(inode, attr); - if (error == 0) { - int result; - if (!error) { - error = yaffs_vfs_setattr(inode, attr); - yaffs_trace(YAFFS_TRACE_OS, "inode_setattr called"); - if (attr->ia_valid & ATTR_SIZE) { - yaffs_vfs_setsize(inode, attr->ia_size); - inode->i_blocks = (inode->i_size + 511) >> 9; - } - } - dev = yaffs_inode_to_obj(inode)->my_dev; - if (attr->ia_valid & ATTR_SIZE) { - yaffs_trace(YAFFS_TRACE_OS, - "resize to %d(%x)", - (int)(attr->ia_size), - (int)(attr->ia_size)); - } - yaffs_gross_lock(dev); - result = yaffs_set_attribs(yaffs_inode_to_obj(inode), attr); - if (result == YAFFS_OK) { - error = 0; - } else { - error = -EPERM; - } - yaffs_gross_unlock(dev); - } +static int yaffs_unlink(struct inode *dir, struct dentry *dentry) +{ + int ret_val; - yaffs_trace(YAFFS_TRACE_OS, "yaffs_setattr done returning %d", error); + struct yaffs_dev *dev; + struct yaffs_obj *obj; - return error; -} + yaffs_trace(YAFFS_TRACE_OS, "yaffs_unlink %d:%s", + (int)(dir->i_ino), dentry->d_name.name); + obj = yaffs_inode_to_obj(dir); + dev = obj->my_dev; -static int yaffs_setxattr(struct dentry *dentry, const char *name, - const void *value, size_t size, int flags) -{ - struct inode *inode = dentry->d_inode; - int error = 0; - struct yaffs_dev *dev; - struct yaffs_obj *obj = yaffs_inode_to_obj(inode); + yaffs_gross_lock(dev); - yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id); + ret_val = yaffs_unlinker(obj, dentry->d_name.name); - if (error == 0) { - int result; - dev = obj->my_dev; - yaffs_gross_lock(dev); - result = yaffs_set_xattrib(obj, name, value, size, flags); - if (result == YAFFS_OK) - error = 0; - else if (result < 0) - error = result; + if (ret_val == YAFFS_OK) { + inode_dec_link_count(dentry->d_inode); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) + inode_inc_iversion(dir); +#else + dir->i_version++; +#endif yaffs_gross_unlock(dev); - + update_dir_time(dir); + return 0; } - yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr done returning %d", error); - - return error; + yaffs_gross_unlock(dev); + return -ENOTEMPTY; } -static ssize_t yaffs_getxattr(struct dentry * dentry, const char *name, - void *buff, size_t size) -{ - struct inode *inode = dentry->d_inode; - int error = 0; - struct yaffs_dev *dev; - struct yaffs_obj *obj = yaffs_inode_to_obj(inode); - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_getxattr \"%s\" from object %d", - name, obj->obj_id); - if (error == 0) { - dev = obj->my_dev; - yaffs_gross_lock(dev); - error = yaffs_get_xattrib(obj, name, buff, size); - yaffs_gross_unlock(dev); +static const struct inode_operations yaffs_dir_inode_operations = { + .create = yaffs_create, + .lookup = yaffs_lookup, + .link = yaffs_link, + .unlink = yaffs_unlink, + .symlink = yaffs_symlink, + .mkdir = yaffs_mkdir, + .rmdir = yaffs_unlink, + .mknod = yaffs_mknod, + .rename = yaffs_rename, + .setattr = yaffs_setattr, + .listxattr = yaffs_listxattr, +#ifdef YAFFS_USE_XATTR + .setxattr = yaffs_setxattr, + .getxattr = yaffs_getxattr, + .removexattr = yaffs_removexattr, +#endif +}; - } - yaffs_trace(YAFFS_TRACE_OS, "yaffs_getxattr done returning %d", error); +/*-----------------------------------------------------------------*/ +/* Directory search context allows us to unlock access to yaffs during + * filldir without causing problems with the directory being modified. + * This is similar to the tried and tested mechanism used in yaffs direct. + * + * A search context iterates along a doubly linked list of siblings in the + * directory. If the iterating object is deleted then this would corrupt + * the list iteration, likely causing a crash. The search context avoids + * this by using the remove_obj_fn to move the search context to the + * next object before the object is deleted. + * + * Many readdirs (and thus seach conexts) may be alive simulateously so + * each struct yaffs_dev has a list of these. + * + * A seach context lives for the duration of a readdir. + * + * All these functions must be called while yaffs is locked. + */ - return error; +struct yaffs_search_context { + struct yaffs_dev *dev; + struct yaffs_obj *dir_obj; + struct yaffs_obj *next_return; + struct list_head others; +}; + +/* + * yaffs_new_search() creates a new search context, initialises it and + * adds it to the device's search context list. + * + * Called at start of readdir. + */ +static struct yaffs_search_context *yaffs_new_search(struct yaffs_obj *dir) +{ + struct yaffs_dev *dev = dir->my_dev; + struct yaffs_search_context *sc = + kmalloc(sizeof(struct yaffs_search_context), GFP_NOFS); + if (sc) { + sc->dir_obj = dir; + sc->dev = dev; + if (list_empty(&sc->dir_obj->variant.dir_variant.children)) + sc->next_return = NULL; + else + sc->next_return = + list_entry(dir->variant.dir_variant.children.next, + struct yaffs_obj, siblings); + INIT_LIST_HEAD(&sc->others); + list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts)); + } + return sc; } -static int yaffs_removexattr(struct dentry *dentry, const char *name) +/* + * yaffs_search_end() disposes of a search context and cleans up. + */ +static void yaffs_search_end(struct yaffs_search_context *sc) { - struct inode *inode = dentry->d_inode; - int error = 0; - struct yaffs_dev *dev; - struct yaffs_obj *obj = yaffs_inode_to_obj(inode); + if (sc) { + list_del(&sc->others); + kfree(sc); + } +} - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_removexattr of object %d", obj->obj_id); +/* + * yaffs_search_advance() moves a search context to the next object. + * Called when the search iterates or when an object removal causes + * the search context to be moved to the next object. + */ +static void yaffs_search_advance(struct yaffs_search_context *sc) +{ + if (!sc) + return; - if (error == 0) { - int result; - dev = obj->my_dev; - yaffs_gross_lock(dev); - result = yaffs_remove_xattrib(obj, name); - if (result == YAFFS_OK) - error = 0; - else if (result < 0) - error = result; - yaffs_gross_unlock(dev); + if (sc->next_return == NULL || + list_empty(&sc->dir_obj->variant.dir_variant.children)) + sc->next_return = NULL; + else { + struct list_head *next = sc->next_return->siblings.next; + if (next == &sc->dir_obj->variant.dir_variant.children) + sc->next_return = NULL; /* end of list */ + else + sc->next_return = + list_entry(next, struct yaffs_obj, siblings); } - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_removexattr done returning %d", error); - - return error; } -static ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size) +/* + * yaffs_remove_obj_callback() is called when an object is unlinked. + * We check open search contexts and advance any which are currently + * on the object being iterated. + */ +static void yaffs_remove_obj_callback(struct yaffs_obj *obj) { - struct inode *inode = dentry->d_inode; - int error = 0; - struct yaffs_dev *dev; - struct yaffs_obj *obj = yaffs_inode_to_obj(inode); - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_listxattr of object %d", obj->obj_id); - - if (error == 0) { - dev = obj->my_dev; - yaffs_gross_lock(dev); - error = yaffs_list_xattrib(obj, buff, size); - yaffs_gross_unlock(dev); + struct list_head *i; + struct yaffs_search_context *sc; + struct list_head *search_contexts = + &(yaffs_dev_to_lc(obj->my_dev)->search_contexts); + /* Iterate through the directory search contexts. + * If any are currently on the object being removed, then advance + * the search context to the next object to prevent a hanging pointer. + */ + list_for_each(i, search_contexts) { + sc = list_entry(i, struct yaffs_search_context, others); + if (sc->next_return == obj) + yaffs_search_advance(sc); } - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_listxattr done returning %d", error); - return error; } -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) -static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf) -{ - struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; - struct super_block *sb = dentry->d_sb; -#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf) +/*-----------------------------------------------------------------*/ + +#ifdef YAFFS_USE_DIR_ITERATE +static int yaffs_iterate(struct file *f, struct dir_context *dc) { - struct yaffs_dev *dev = yaffs_super_to_dev(sb); + struct yaffs_obj *obj; + struct yaffs_dev *dev; + struct yaffs_search_context *sc; + unsigned long curoffs; + struct yaffs_obj *l; + int ret_val = 0; + + char name[YAFFS_MAX_NAME_LENGTH + 1]; + + obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); + dev = obj->my_dev; + + yaffs_gross_lock(dev); + + yaffs_dev_to_lc(dev)->readdir_process = current; + + sc = yaffs_new_search(obj); + if (!sc) { + ret_val = -ENOMEM; + goto out; + } + + if (!dir_emit_dots(f, dc)) { + yaffs_gross_unlock(dev); + return 0; + } + + curoffs = 1; + + while (sc->next_return) { + curoffs++; + l = sc->next_return; + if (curoffs >= dc->pos) { + int this_inode = yaffs_get_obj_inode(l); + int this_type = yaffs_get_obj_type(l); + + yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1); + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_readdir: %s inode %d", + name, yaffs_get_obj_inode(l)); + + yaffs_gross_unlock(dev); + + if (!dir_emit(dc, + name, + strlen(name), + this_inode, + this_type)) { + yaffs_gross_lock(dev); + goto out; + } + + yaffs_gross_lock(dev); + + dc->pos++; + f->f_pos++; + } + yaffs_search_advance(sc); + } + +out: + yaffs_search_end(sc); + yaffs_dev_to_lc(dev)->readdir_process = NULL; + yaffs_gross_unlock(dev); + + return ret_val; +} + #else -static int yaffs_statfs(struct super_block *sb, struct statfs *buf) + +static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) { - struct yaffs_dev *dev = yaffs_super_to_dev(sb); -#endif + struct yaffs_obj *obj; + struct yaffs_dev *dev; + struct yaffs_search_context *sc; + struct inode *inode = Y_GET_DENTRY(f)->d_inode; + unsigned long offset, curoffs; + struct yaffs_obj *l; + int ret_val = 0; - yaffs_trace(YAFFS_TRACE_OS, "yaffs_statfs"); + char name[YAFFS_MAX_NAME_LENGTH + 1]; + + obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); + dev = obj->my_dev; yaffs_gross_lock(dev); - buf->f_type = YAFFS_MAGIC; - buf->f_bsize = sb->s_blocksize; - buf->f_namelen = 255; + yaffs_dev_to_lc(dev)->readdir_process = current; - if (dev->data_bytes_per_chunk & (dev->data_bytes_per_chunk - 1)) { - /* Do this if chunk size is not a power of 2 */ + offset = f->f_pos; - uint64_t bytes_in_dev; - uint64_t bytes_free; + sc = yaffs_new_search(obj); + if (!sc) { + ret_val = -ENOMEM; + goto out; + } - bytes_in_dev = - ((uint64_t) - ((dev->param.end_block - dev->param.start_block + - 1))) * ((uint64_t) (dev->param.chunks_per_block * - dev->data_bytes_per_chunk)); + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_readdir: starting at %d", (int)offset); - do_div(bytes_in_dev, sb->s_blocksize); /* bytes_in_dev becomes the number of blocks */ - buf->f_blocks = bytes_in_dev; + if (offset == 0) { + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_readdir: entry . ino %d", + (int)inode->i_ino); + yaffs_gross_unlock(dev); + if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0) { + yaffs_gross_lock(dev); + goto out; + } + yaffs_gross_lock(dev); + offset++; + f->f_pos++; + } + if (offset == 1) { + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_readdir: entry .. ino %d", + (int)f->f_dentry->d_parent->d_inode->i_ino); + yaffs_gross_unlock(dev); + if (filldir(dirent, "..", 2, offset, + f->f_dentry->d_parent->d_inode->i_ino, + DT_DIR) < 0) { + yaffs_gross_lock(dev); + goto out; + } + yaffs_gross_lock(dev); + offset++; + f->f_pos++; + } - bytes_free = ((uint64_t) (yaffs_get_n_free_chunks(dev))) * - ((uint64_t) (dev->data_bytes_per_chunk)); + curoffs = 1; - do_div(bytes_free, sb->s_blocksize); + /* 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; + f->f_version = inode->i_version; + } - buf->f_bfree = bytes_free; + while (sc->next_return) { + curoffs++; + l = sc->next_return; + if (curoffs >= offset) { + int this_inode = yaffs_get_obj_inode(l); + int this_type = yaffs_get_obj_type(l); - } else if (sb->s_blocksize > dev->data_bytes_per_chunk) { + yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1); + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_readdir: %s inode %d", + name, yaffs_get_obj_inode(l)); - buf->f_blocks = - (dev->param.end_block - dev->param.start_block + 1) * - dev->param.chunks_per_block / - (sb->s_blocksize / dev->data_bytes_per_chunk); - buf->f_bfree = - yaffs_get_n_free_chunks(dev) / - (sb->s_blocksize / dev->data_bytes_per_chunk); - } else { - buf->f_blocks = - (dev->param.end_block - dev->param.start_block + 1) * - dev->param.chunks_per_block * - (dev->data_bytes_per_chunk / sb->s_blocksize); + yaffs_gross_unlock(dev); - buf->f_bfree = - yaffs_get_n_free_chunks(dev) * - (dev->data_bytes_per_chunk / sb->s_blocksize); + if (filldir(dirent, + name, + strlen(name), + offset, this_inode, this_type) < 0) { + yaffs_gross_lock(dev); + goto out; + } + + yaffs_gross_lock(dev); + + offset++; + f->f_pos++; + } + yaffs_search_advance(sc); } - buf->f_files = 0; - buf->f_ffree = 0; - buf->f_bavail = buf->f_bfree; +out: + yaffs_search_end(sc); + yaffs_dev_to_lc(dev)->readdir_process = NULL; + yaffs_gross_unlock(dev); + + return ret_val; +} + +#endif + +static const struct file_operations yaffs_dir_operations = { + .read = generic_read_dir, +#ifdef YAFFS_USE_DIR_ITERATE + .iterate = yaffs_iterate, +#else + .readdir = yaffs_readdir, +#endif + .fsync = yaffs_sync_object, + .llseek = generic_file_llseek, +}; + +static void yaffs_fill_inode_from_obj(struct inode *inode, + struct yaffs_obj *obj) +{ + if (inode && obj) { + + /* Check mode against the variant type and attempt to repair if broken. */ + u32 mode = obj->yst_mode; + switch (obj->variant_type) { + case YAFFS_OBJECT_TYPE_FILE: + if (!S_ISREG(mode)) { + obj->yst_mode &= ~S_IFMT; + obj->yst_mode |= S_IFREG; + } + + break; + case YAFFS_OBJECT_TYPE_SYMLINK: + if (!S_ISLNK(mode)) { + obj->yst_mode &= ~S_IFMT; + obj->yst_mode |= S_IFLNK; + } + + break; + case YAFFS_OBJECT_TYPE_DIRECTORY: + if (!S_ISDIR(mode)) { + obj->yst_mode &= ~S_IFMT; + obj->yst_mode |= S_IFDIR; + } + + break; + case YAFFS_OBJECT_TYPE_UNKNOWN: + case YAFFS_OBJECT_TYPE_HARDLINK: + case YAFFS_OBJECT_TYPE_SPECIAL: + default: + /* TODO? */ + break; + } + + inode->i_flags |= S_NOATIME; + + inode->i_ino = obj->obj_id; + inode->i_mode = obj->yst_mode; + inode->i_uid = MAKE_uid(obj->yst_uid); + inode->i_gid = MAKE_gid(obj->yst_gid); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) + inode->i_blksize = inode->i_sb->s_blocksize; +#endif +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + + inode->i_rdev = old_decode_dev(obj->yst_rdev); + inode->i_atime.tv_sec = (time_t) (obj->yst_atime); + inode->i_atime.tv_nsec = 0; + inode->i_mtime.tv_sec = (time_t) obj->yst_mtime; + inode->i_mtime.tv_nsec = 0; + inode->i_ctime.tv_sec = (time_t) obj->yst_ctime; + inode->i_ctime.tv_nsec = 0; +#else + inode->i_rdev = obj->yst_rdev; + inode->i_atime = obj->yst_atime; + inode->i_mtime = obj->yst_mtime; + inode->i_ctime = obj->yst_ctime; +#endif + inode->i_size = yaffs_get_obj_length(obj); + inode->i_blocks = (inode->i_size + 511) >> 9; + + set_nlink(inode, yaffs_get_obj_link_count(obj)); + + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_fill_inode mode %x uid %d gid %d size %lld count %d", + inode->i_mode, obj->yst_uid, obj->yst_gid, + inode->i_size, atomic_read(&inode->i_count)); + + switch (obj->yst_mode & S_IFMT) { + default: /* fifo, device or socket */ +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + init_special_inode(inode, obj->yst_mode, + old_decode_dev(obj->yst_rdev)); +#else + init_special_inode(inode, obj->yst_mode, + (dev_t) (obj->yst_rdev)); +#endif + break; + case S_IFREG: /* file */ + inode->i_op = &yaffs_file_inode_operations; + inode->i_fop = &yaffs_file_operations; + inode->i_mapping->a_ops = + &yaffs_file_address_operations; + break; + case S_IFDIR: /* directory */ + inode->i_op = &yaffs_dir_inode_operations; + inode->i_fop = &yaffs_dir_operations; + break; + case S_IFLNK: /* symlink */ + inode->i_op = &yaffs_symlink_inode_operations; + break; + } - yaffs_gross_unlock(dev); - return 0; -} + yaffs_inode_to_obj_lv(inode) = obj; -static void yaffs_flush_inodes(struct super_block *sb) -{ - struct inode *iptr; - struct yaffs_obj *obj; + obj->my_inode = inode; - list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) { - obj = yaffs_inode_to_obj(iptr); - if (obj) { - yaffs_trace(YAFFS_TRACE_OS, - "flushing obj %d", - obj->obj_id); - yaffs_flush_file(obj, 1, 0); - } + } else { + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_fill_inode invalid parameters"); } + } -static void yaffs_flush_super(struct super_block *sb, int do_checkpoint) -{ - struct yaffs_dev *dev = yaffs_super_to_dev(sb); - if (!dev) - return; - yaffs_flush_inodes(sb); - yaffs_update_dirty_dirs(dev); - yaffs_flush_whole_cache(dev); - if (do_checkpoint) - yaffs_checkpoint_save(dev); -} + +/* + * yaffs background thread functions . + * yaffs_bg_thread_fn() the thread function + * yaffs_bg_start() launches the background thread. + * yaffs_bg_stop() cleans up the background thread. + * + * NB: + * The thread should only run after the yaffs is initialised + * The thread should be stopped before yaffs is unmounted. + * The thread should not do any writing while the fs is in read only. + */ static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev) { @@ -2194,54 +2143,28 @@ static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev) return 2; } -static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint) -{ - - struct yaffs_dev *dev = yaffs_super_to_dev(sb); - unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4); - unsigned gc_urgent = yaffs_bg_gc_urgency(dev); - int do_checkpoint; - - yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND, - "yaffs_do_sync_fs: gc-urgency %d %s %s%s", - gc_urgent, - sb->s_dirt ? "dirty" : "clean", - request_checkpoint ? "checkpoint requested" : "no checkpoint", - oneshot_checkpoint ? " one-shot" : ""); +#ifdef YAFFS_COMPILE_BACKGROUND - yaffs_gross_lock(dev); - do_checkpoint = ((request_checkpoint && !gc_urgent) || - oneshot_checkpoint) && !dev->is_checkpointed; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) +struct timer_struct { + struct task_struct *task; + struct timer_list timer; +}; +#endif - if (sb->s_dirt || do_checkpoint) { - yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint); - sb->s_dirt = 0; - if (oneshot_checkpoint) - yaffs_auto_checkpoint &= ~4; - } - yaffs_gross_unlock(dev); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) +static void yaffs_background_waker(struct timer_list *t) +{ + struct timer_struct *ts = from_timer(ts, t, timer); - return 0; + wake_up_process(ts->task); } - -/* - * yaffs background thread functions . - * yaffs_bg_thread_fn() the thread function - * yaffs_bg_start() launches the background thread. - * yaffs_bg_stop() cleans up the background thread. - * - * NB: - * The thread should only run after the yaffs is initialised - * The thread should be stopped before yaffs is unmounted. - * The thread should not do any writing while the fs is in read only. - */ - -#ifdef YAFFS_COMPILE_BACKGROUND - +#else void yaffs_background_waker(unsigned long data) { wake_up_process((struct task_struct *)data); } +#endif static int yaffs_bg_thread_fn(void *data) { @@ -2254,7 +2177,11 @@ static int yaffs_bg_thread_fn(void *data) unsigned int urgency; int gc_result; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) + struct timer_struct timer; +#else struct timer_list timer; +#endif yaffs_trace(YAFFS_TRACE_BACKGROUND, "yaffs_background starting for dev %p", (void *)dev); @@ -2300,232 +2227,554 @@ static int yaffs_bg_thread_fn(void *data) } } yaffs_gross_unlock(dev); -#if 1 expires = next_dir_update; if (time_before(next_gc, expires)) expires = next_gc; if (time_before(expires, now)) expires = now + HZ; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) + Y_INIT_TIMER(&timer.timer, yaffs_background_waker); + timer.timer.expires = expires + 1; + timer.task = current; +#else Y_INIT_TIMER(&timer); timer.expires = expires + 1; timer.data = (unsigned long)current; timer.function = yaffs_background_waker; +#endif set_current_state(TASK_INTERRUPTIBLE); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) + add_timer(&timer.timer); + schedule(); + del_timer_sync(&timer.timer); +#else add_timer(&timer); schedule(); del_timer_sync(&timer); +#endif + } + + return 0; +} + +static int yaffs_bg_start(struct yaffs_dev *dev) +{ + int retval = 0; + struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); + + if (dev->read_only) + return -1; + + context->bg_running = 1; + + context->bg_thread = kthread_run(yaffs_bg_thread_fn, + (void *)dev, "yaffs-bg-%d", + context->mount_id); + + if (IS_ERR(context->bg_thread)) { + retval = PTR_ERR(context->bg_thread); + context->bg_thread = NULL; + context->bg_running = 0; + } + return retval; +} + +static void yaffs_bg_stop(struct yaffs_dev *dev) +{ + struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev); + + ctxt->bg_running = 0; + + if (ctxt->bg_thread) { + kthread_stop(ctxt->bg_thread); + ctxt->bg_thread = NULL; + } +} #else - msleep(10); +static int yaffs_bg_thread_fn(void *data) +{ + return 0; +} + +static int yaffs_bg_start(struct yaffs_dev *dev) +{ + return 0; +} + +static void yaffs_bg_stop(struct yaffs_dev *dev) +{ +} #endif + + +static void yaffs_flush_inodes(struct super_block *sb) +{ + struct inode *iptr; + struct yaffs_obj *obj; + + list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) { + obj = yaffs_inode_to_obj(iptr); + if (obj) { + yaffs_trace(YAFFS_TRACE_OS, + "flushing obj %d", + obj->obj_id); + yaffs_flush_file(obj, 1, 0, 0); + } + } +} + +static void yaffs_flush_super(struct super_block *sb, int do_checkpoint) +{ + struct yaffs_dev *dev = yaffs_super_to_dev(sb); + if (!dev) + return; + + yaffs_flush_inodes(sb); + yaffs_update_dirty_dirs(dev); + yaffs_flush_whole_cache(dev, 1); + if (do_checkpoint) + yaffs_checkpoint_save(dev); +} + +static LIST_HEAD(yaffs_context_list); +struct mutex yaffs_context_lock; + +static void yaffs_put_super(struct super_block *sb) +{ + struct yaffs_dev *dev = yaffs_super_to_dev(sb); + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); + + yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS, + "yaffs_put_super"); + + yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, + "Shutting down yaffs background thread"); + yaffs_bg_stop(dev); + yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, + "yaffs background thread shut down"); + + yaffs_gross_lock(dev); + + yaffs_flush_super(sb, 1); + + yaffs_deinitialise(dev); + + yaffs_gross_unlock(dev); + + mutex_lock(&yaffs_context_lock); + list_del_init(&(yaffs_dev_to_lc(dev)->context_list)); + mutex_unlock(&yaffs_context_lock); + + if (yaffs_dev_to_lc(dev)->spare_buffer) { + kfree(yaffs_dev_to_lc(dev)->spare_buffer); + yaffs_dev_to_lc(dev)->spare_buffer = NULL; + } + + kfree(dev); + + yaffs_put_mtd_device(mtd); + + yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS, + "yaffs_put_super done"); +} + + +static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev) +{ + return yaffs_gc_control; +} + + +#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; + struct yaffs_obj *d_obj; + struct yaffs_obj *parent_obj; + + d_obj = yaffs_inode_to_obj(dentry->d_inode); + + if (d_obj) { + parent_obj = d_obj->parent; + if (parent_obj) { + parent_ino = yaffs_get_obj_inode(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 0; + return parent; } -static int yaffs_bg_start(struct yaffs_dev *dev) -{ - int retval = 0; - struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); +/* Just declare a zero structure as a NULL value implies + * using the default functions of exportfs. + */ - if (dev->read_only) - return -1; +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, +}; - context->bg_running = 1; +#endif - context->bg_thread = kthread_run(yaffs_bg_thread_fn, - (void *)dev, "yaffs-bg-%d", - context->mount_id); +static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj) +{ + /* Clear the association between the inode and + * the struct yaffs_obj. + */ + obj->my_inode = NULL; + yaffs_inode_to_obj_lv(inode) = NULL; - if (IS_ERR(context->bg_thread)) { - retval = PTR_ERR(context->bg_thread); - context->bg_thread = NULL; - context->bg_running = 0; - } - return retval; + /* If the object freeing was deferred, then the real + * free happens now. + * This should fix the inode inconsistency problem. + */ + yaffs_handle_defered_free(obj); } -static void yaffs_bg_stop(struct yaffs_dev *dev) +#ifdef YAFFS_HAS_EVICT_INODE +/* yaffs_evict_inode combines into one operation what was previously done in + * yaffs_clear_inode() and yaffs_delete_inode() + * + */ +static void yaffs_evict_inode(struct inode *inode) { - struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev); + struct yaffs_obj *obj; + struct yaffs_dev *dev; + int deleteme = 0; - ctxt->bg_running = 0; + obj = yaffs_inode_to_obj(inode); - if (ctxt->bg_thread) { - kthread_stop(ctxt->bg_thread); - ctxt->bg_thread = NULL; + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_evict_inode: ino %d, count %d %s", + (int)inode->i_ino, atomic_read(&inode->i_count), + obj ? "object exists" : "null object"); + + if (!inode->i_nlink && !is_bad_inode(inode)) + deleteme = 1; + truncate_inode_pages(&inode->i_data, 0); + Y_CLEAR_INODE(inode); + + if (deleteme && obj) { + dev = obj->my_dev; + yaffs_gross_lock(dev); + yaffs_del_obj(obj); + yaffs_gross_unlock(dev); + } + if (obj) { + dev = obj->my_dev; + yaffs_gross_lock(dev); + yaffs_unstitch_obj(inode, obj); + yaffs_gross_unlock(dev); } } #else -static int yaffs_bg_thread_fn(void *data) -{ - return 0; -} -static int yaffs_bg_start(struct yaffs_dev *dev) -{ - return 0; -} +/* clear is called to tell the fs to release any per-inode data it holds. + * The object might still exist on disk and is just being thrown out of the cache + * or else the object has actually been deleted and we're being called via + * the chain + * yaffs_delete_inode() -> clear_inode()->yaffs_clear_inode() + */ -static void yaffs_bg_stop(struct yaffs_dev *dev) +static void yaffs_clear_inode(struct inode *inode) { -} -#endif + struct yaffs_obj *obj; + struct yaffs_dev *dev; -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) -static void yaffs_write_super(struct super_block *sb) -#else -static int yaffs_write_super(struct super_block *sb) -#endif -{ - unsigned request_checkpoint = (yaffs_auto_checkpoint >= 2); + obj = yaffs_inode_to_obj(inode); - yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND, - "yaffs_write_super %s", - request_checkpoint ? " checkpt" : ""); + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_clear_inode: ino %d, count %d %s", + (int)inode->i_ino, atomic_read(&inode->i_count), + obj ? "object exists" : "null object"); - yaffs_do_sync_fs(sb, request_checkpoint); + if (obj) { + dev = obj->my_dev; + yaffs_gross_lock(dev); + yaffs_unstitch_obj(inode, obj); + yaffs_gross_unlock(dev); + } -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)) - return 0; -#endif } -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) -static int yaffs_sync_fs(struct super_block *sb, int wait) -#else -static int yaffs_sync_fs(struct super_block *sb) -#endif +/* delete is called when the link count is zero and the inode + * is put (ie. nobody wants to know about it anymore, time to + * delete the file). + * NB Must call clear_inode() + */ +static void yaffs_delete_inode(struct inode *inode) { - unsigned request_checkpoint = (yaffs_auto_checkpoint >= 1); - - yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, - "yaffs_sync_fs%s", request_checkpoint ? " checkpt" : ""); + struct yaffs_obj *obj = yaffs_inode_to_obj(inode); + struct yaffs_dev *dev; - yaffs_do_sync_fs(sb, request_checkpoint); + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_delete_inode: ino %d, count %d %s", + (int)inode->i_ino, atomic_read(&inode->i_count), + obj ? "object exists" : "null object"); - return 0; + if (obj) { + dev = obj->my_dev; + yaffs_gross_lock(dev); + yaffs_del_obj(obj); + yaffs_gross_unlock(dev); + } +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13)) + truncate_inode_pages(&inode->i_data, 0); +#endif + clear_inode(inode); } +#endif -#ifdef YAFFS_USE_OWN_IGET -static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino) -{ - struct inode *inode; - struct yaffs_obj *obj; - struct yaffs_dev *dev = yaffs_super_to_dev(sb); - yaffs_trace(YAFFS_TRACE_OS, "yaffs_iget for %lu", ino); - inode = iget_locked(sb, ino); - if (!inode) - return ERR_PTR(-ENOMEM); - if (!(inode->i_state & I_NEW)) - return inode; +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) +static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf) +{ + struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; + struct super_block *sb = dentry->d_sb; +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) +static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf) +{ + struct yaffs_dev *dev = yaffs_super_to_dev(sb); +#else +static int yaffs_statfs(struct super_block *sb, struct statfs *buf) +{ + struct yaffs_dev *dev = yaffs_super_to_dev(sb); +#endif - /* NB This is called as a side effect of other functions, but - * we had to release the lock to prevent deadlocks, so - * need to lock again. - */ + yaffs_trace(YAFFS_TRACE_OS, "yaffs_statfs"); yaffs_gross_lock(dev); - obj = yaffs_find_by_number(dev, inode->i_ino); + buf->f_type = YAFFS_MAGIC; + buf->f_bsize = sb->s_blocksize; + buf->f_namelen = 255; - yaffs_fill_inode_from_obj(inode, obj); + if (dev->data_bytes_per_chunk & (dev->data_bytes_per_chunk - 1)) { + /* Do this if chunk size is not a power of 2 */ - yaffs_gross_unlock(dev); + uint64_t bytes_in_dev; + uint64_t bytes_free; - unlock_new_inode(inode); - return inode; -} + bytes_in_dev = + ((uint64_t) + ((dev->param.end_block - dev->param.start_block + + 1))) * ((uint64_t) (dev->param.chunks_per_block * + dev->data_bytes_per_chunk)); -#else + do_div(bytes_in_dev, sb->s_blocksize); /* bytes_in_dev becomes the number of blocks */ + buf->f_blocks = bytes_in_dev; -static void yaffs_read_inode(struct inode *inode) -{ - /* NB This is called as a side effect of other functions, but - * we had to release the lock to prevent deadlocks, so - * need to lock again. - */ + bytes_free = ((uint64_t) (yaffs_get_n_free_chunks(dev))) * + ((uint64_t) (dev->data_bytes_per_chunk)); - struct yaffs_obj *obj; - struct yaffs_dev *dev = yaffs_super_to_dev(inode->i_sb); + do_div(bytes_free, sb->s_blocksize); - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_read_inode for %d", (int)inode->i_ino); + buf->f_bfree = bytes_free; - if (current != yaffs_dev_to_lc(dev)->readdir_process) - yaffs_gross_lock(dev); + } else if (sb->s_blocksize > dev->data_bytes_per_chunk) { - obj = yaffs_find_by_number(dev, inode->i_ino); + buf->f_blocks = + (dev->param.end_block - dev->param.start_block + 1) * + dev->param.chunks_per_block / + (sb->s_blocksize / dev->data_bytes_per_chunk); + buf->f_bfree = + yaffs_get_n_free_chunks(dev) / + (sb->s_blocksize / dev->data_bytes_per_chunk); + } else { + buf->f_blocks = + (dev->param.end_block - dev->param.start_block + 1) * + dev->param.chunks_per_block * + (dev->data_bytes_per_chunk / sb->s_blocksize); + + buf->f_bfree = + yaffs_get_n_free_chunks(dev) * + (dev->data_bytes_per_chunk / sb->s_blocksize); + } - yaffs_fill_inode_from_obj(inode, obj); + buf->f_files = 0; + buf->f_ffree = 0; + buf->f_bavail = buf->f_bfree; - if (current != yaffs_dev_to_lc(dev)->readdir_process) - yaffs_gross_unlock(dev); + yaffs_gross_unlock(dev); + return 0; } -#endif -static LIST_HEAD(yaffs_context_list); -struct mutex yaffs_context_lock; -static void yaffs_put_super(struct super_block *sb) +static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint) { - struct yaffs_dev *dev = yaffs_super_to_dev(sb); - yaffs_trace(YAFFS_TRACE_OS, "yaffs_put_super"); + struct yaffs_dev *dev = yaffs_super_to_dev(sb); + unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4); + unsigned gc_urgent = yaffs_bg_gc_urgency(dev); + int do_checkpoint; + int dirty = yaffs_check_super_dirty(dev); - yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, - "Shutting down yaffs background thread"); - yaffs_bg_stop(dev); - yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, - "yaffs background thread shut down"); + yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND, + "yaffs_do_sync_fs: gc-urgency %d %s %s%s", + gc_urgent, + dirty ? "dirty" : "clean", + request_checkpoint ? "checkpoint requested" : "no checkpoint", + oneshot_checkpoint ? " one-shot" : ""); yaffs_gross_lock(dev); + do_checkpoint = ((request_checkpoint && !gc_urgent) || + oneshot_checkpoint) && !dev->is_checkpointed; - yaffs_flush_super(sb, 1); + if (dirty || do_checkpoint) { + yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint); + yaffs_clear_super_dirty(dev); + if (oneshot_checkpoint) + yaffs_auto_checkpoint &= ~4; + } + yaffs_gross_unlock(dev); - if (yaffs_dev_to_lc(dev)->put_super_fn) - yaffs_dev_to_lc(dev)->put_super_fn(sb); + return 0; +} - yaffs_deinitialise(dev); - yaffs_gross_unlock(dev); +#ifdef YAFFS_HAS_WRITE_SUPER +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) +static void yaffs_write_super(struct super_block *sb) +#else +static int yaffs_write_super(struct super_block *sb) +#endif +{ + unsigned request_checkpoint = (yaffs_auto_checkpoint >= 2); - mutex_lock(&yaffs_context_lock); - list_del_init(&(yaffs_dev_to_lc(dev)->context_list)); - mutex_unlock(&yaffs_context_lock); + yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND, + "yaffs_write_super %s", + request_checkpoint ? " checkpt" : ""); - if (yaffs_dev_to_lc(dev)->spare_buffer) { - kfree(yaffs_dev_to_lc(dev)->spare_buffer); - yaffs_dev_to_lc(dev)->spare_buffer = NULL; - } + yaffs_do_sync_fs(sb, request_checkpoint); - kfree(dev); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)) + return 0; +#endif } +#endif -static void yaffs_mtd_put_super(struct super_block *sb) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) +static int yaffs_sync_fs(struct super_block *sb, int wait) +#else +static int yaffs_sync_fs(struct super_block *sb) +#endif { - struct mtd_info *mtd = yaffs_dev_to_mtd(yaffs_super_to_dev(sb)); + unsigned request_checkpoint = (yaffs_auto_checkpoint >= 1); + + yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, + "yaffs_sync_fs%s", request_checkpoint ? " checkpt" : ""); - if (mtd->sync) - mtd->sync(mtd); + yaffs_do_sync_fs(sb, request_checkpoint); - put_mtd_device(mtd); + return 0; } -static void yaffs_touch_super(struct yaffs_dev *dev) +/* the function only is used to change dev->read_only when this file system + * is remounted. + */ +static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data) { - struct super_block *sb = yaffs_dev_to_lc(dev)->super; + int read_only = 0; + struct mtd_info *mtd; + struct yaffs_dev *dev = 0; + + /* Get the device */ + mtd = get_mtd_device(NULL, MINOR(sb->s_dev)); + if (!mtd) { + yaffs_trace(YAFFS_TRACE_ALWAYS, + "MTD device #%u doesn't appear to exist", + MINOR(sb->s_dev)); + return 1; + } + + /* Check it's NAND */ + if (mtd->type != MTD_NANDFLASH) { + yaffs_trace(YAFFS_TRACE_ALWAYS, + "MTD device is not NAND it's type %d", + mtd->type); + return 1; + } + + read_only = ((*flags & MS_RDONLY) != 0); + if (!read_only && !(mtd->flags & MTD_WRITEABLE)) { + read_only = 1; + printk(KERN_INFO + "yaffs: mtd is read only, setting superblock read only"); + *flags |= MS_RDONLY; + } + + dev = sb->s_fs_info; + dev->read_only = read_only; - yaffs_trace(YAFFS_TRACE_OS, "yaffs_touch_super() sb = %p", sb); - if (sb) - sb->s_dirt = 1; + return 0; } +static const struct super_operations yaffs_super_ops = { + .statfs = yaffs_statfs, + +#ifndef YAFFS_USE_OWN_IGET + .read_inode = yaffs_read_inode, +#endif +#ifdef YAFFS_HAS_PUT_INODE + .put_inode = yaffs_put_inode, +#endif + .put_super = yaffs_put_super, +#ifdef YAFFS_HAS_EVICT_INODE + .evict_inode = yaffs_evict_inode, +#else + .delete_inode = yaffs_delete_inode, + .clear_inode = yaffs_clear_inode, +#endif + .sync_fs = yaffs_sync_fs, +#ifdef YAFFS_HAS_WRITE_SUPER + .write_super = yaffs_write_super, +#endif + .remount_fs = yaffs_remount_fs, +}; + struct yaffs_options { int inband_tags; int skip_checkpoint_read; @@ -2606,6 +2855,24 @@ static int yaffs_parse_options(struct yaffs_options *options, return error; } + +static struct dentry *yaffs_make_root(struct inode *inode) +{ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)) + struct dentry *root = d_alloc_root(inode); + + if (!root) + iput(inode); + + return root; +#else + return d_make_root(inode); +#endif +} + + + + static struct super_block *yaffs_internal_read_super(int yaffs_version, struct super_block *sb, void *data, int silent) @@ -2622,6 +2889,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, struct yaffs_param *param; int read_only = 0; + int inband_tags = 0; struct yaffs_options options; @@ -2679,41 +2947,14 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, 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) - return NULL; /* This isn't an mtd device */ - /* Get the device */ mtd = get_mtd_device(NULL, MINOR(sb->s_dev)); - if (!mtd) { + if (IS_ERR(mtd)) { yaffs_trace(YAFFS_TRACE_ALWAYS, - "yaffs: MTD device #%u doesn't appear to exist", + "yaffs: MTD device %u either not valid or unavailable", MINOR(sb->s_dev)); return NULL; } - /* Check it's NAND */ - if (mtd->type != MTD_NANDFLASH) { - yaffs_trace(YAFFS_TRACE_ALWAYS, - "yaffs: MTD device is not NAND it's type %d", - mtd->type); - return NULL; - } - - yaffs_trace(YAFFS_TRACE_OS, " erase %p", mtd->erase); - yaffs_trace(YAFFS_TRACE_OS, " read %p", mtd->read); - yaffs_trace(YAFFS_TRACE_OS, " write %p", mtd->write); - yaffs_trace(YAFFS_TRACE_OS, " readoob %p", mtd->read_oob); - yaffs_trace(YAFFS_TRACE_OS, " writeoob %p", mtd->write_oob); - yaffs_trace(YAFFS_TRACE_OS, " block_isbad %p", mtd->block_isbad); - yaffs_trace(YAFFS_TRACE_OS, " block_markbad %p", mtd->block_markbad); - yaffs_trace(YAFFS_TRACE_OS, " %s %d", WRITE_SIZE_STR, WRITE_SIZE(mtd)); - yaffs_trace(YAFFS_TRACE_OS, " oobsize %d", mtd->oobsize); - yaffs_trace(YAFFS_TRACE_OS, " erasesize %d", mtd->erasesize); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) - yaffs_trace(YAFFS_TRACE_OS, " size %u", mtd->size); -#else - yaffs_trace(YAFFS_TRACE_OS, " size %lld", mtd->size); -#endif if (yaffs_auto_select && yaffs_version == 1 && WRITE_SIZE(mtd) >= 2048) { yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs2"); @@ -2727,54 +2968,12 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, yaffs_version = 1; } - if (yaffs_version == 2) { - /* Check for version 2 style functions */ - if (!mtd->erase || - !mtd->block_isbad || - !mtd->block_markbad || !mtd->read || !mtd->write || -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) - !mtd->read_oob || !mtd->write_oob) { -#else - !mtd->write_ecc || - !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) { -#endif - yaffs_trace(YAFFS_TRACE_ALWAYS, - "MTD device does not support required functions" - ); - return NULL; - } - - if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE || - mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) && - !options.inband_tags) { - yaffs_trace(YAFFS_TRACE_ALWAYS, - "MTD device does not have the right page sizes" - ); - return NULL; - } - } else { - /* Check for V1 style functions */ - if (!mtd->erase || !mtd->read || !mtd->write || -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) - !mtd->read_oob || !mtd->write_oob) { -#else - !mtd->write_ecc || - !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) { -#endif - yaffs_trace(YAFFS_TRACE_ALWAYS, - "MTD device does not support required functions" - ); - return NULL; - } + if (mtd->oobavail < sizeof(struct yaffs_packed_tags2) || + options.inband_tags) + inband_tags = 1; - if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK || - mtd->oobsize != YAFFS_BYTES_PER_SPARE) { - yaffs_trace(YAFFS_TRACE_ALWAYS, - "MTD device does not support have the right page sizes" - ); - return NULL; - } - } + if(yaffs_verify_mtd(mtd, yaffs_version, inband_tags) < 0) + return NULL; /* OK, so if we got here, we have an MTD that's NAND and looks * like it has the right capabilities @@ -2793,15 +2992,11 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, context = kmalloc(sizeof(struct yaffs_linux_context), GFP_KERNEL); if (!dev || !context) { - if (dev) - kfree(dev); - if (context) - kfree(context); + kfree(dev); + kfree(context); dev = NULL; context = NULL; - } - if (!dev) { /* Deep shit could not allocate device structure */ yaffs_trace(YAFFS_TRACE_ALWAYS, "yaffs_read_super: Failed trying to allocate struct yaffs_dev." @@ -2831,17 +3026,10 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, /* Set up the memory size parameters.... */ - n_blocks = - YCALCBLOCKS(mtd->size, - (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK)); - param->start_block = 0; - param->end_block = n_blocks - 1; - param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK; - param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK; param->n_reserved_blocks = 5; param->n_caches = (options.no_cache) ? 0 : 10; - param->inband_tags = options.inband_tags; + param->inband_tags = inband_tags; param->enable_xattr = 1; if (options.lazy_loading_overridden) @@ -2856,17 +3044,15 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, param->refresh_period = 500; param->disable_summary = options.disable_summary; + +#ifdef CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING + param->disable_bad_block_marking = 1; +#endif if (options.empty_lost_and_found_overridden) param->empty_lost_n_found = options.empty_lost_and_found; /* ... and the functions. */ if (yaffs_version == 2) { - param->write_chunk_tags_fn = nandmtd2_write_chunk_tags; - param->read_chunk_tags_fn = nandmtd2_read_chunk_tags; - param->bad_block_fn = nandmtd2_mark_block_bad; - param->query_block_fn = nandmtd2_query_block; - yaffs_dev_to_lc(dev)->spare_buffer = - kmalloc(mtd->oobsize, GFP_NOFS); param->is_yaffs2 = 1; #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) param->total_bytes_per_chunk = mtd->writesize; @@ -2880,26 +3066,21 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, param->start_block = 0; param->end_block = n_blocks - 1; } else { -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) - /* use the MTD interface in yaffs_mtdif1.c */ - param->write_chunk_tags_fn = nandmtd1_write_chunk_tags; - param->read_chunk_tags_fn = nandmtd1_read_chunk_tags; - param->bad_block_fn = nandmtd1_mark_block_bad; - param->query_block_fn = nandmtd1_query_block; -#else - param->write_chunk_fn = nandmtd_write_chunk; - param->read_chunk_fn = nandmtd_read_chunk; -#endif param->is_yaffs2 = 0; + n_blocks = YCALCBLOCKS(mtd->size, + YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK); + + param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK; + param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK; } - /* ... and common functions */ - param->erase_fn = nandmtd_erase_block; - param->initialise_flash_fn = nandmtd_initialise; - yaffs_dev_to_lc(dev)->put_super_fn = yaffs_mtd_put_super; + param->start_block = 0; + param->end_block = n_blocks - 1; + + yaffs_mtd_drv_install(dev); - param->sb_dirty_fn = yaffs_touch_super; - param->gc_control = yaffs_gc_control_callback; + param->sb_dirty_fn = yaffs_set_super_dirty; + param->gc_control_fn = yaffs_gc_control_callback; yaffs_dev_to_lc(dev)->super = sb; @@ -2964,16 +3145,15 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: got root inode"); - root = d_alloc_root(inode); - - yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: d_alloc_root done"); + root = yaffs_make_root(inode); - if (!root) { - iput(inode); + if (!root) return NULL; - } + sb->s_root = root; - sb->s_dirt = !dev->is_checkpointed; + if(!dev->is_checkpointed) + yaffs_set_super_dirty(dev); + yaffs_trace(YAFFS_TRACE_ALWAYS, "yaffs_read_super: is_checkpointed %d", dev->is_checkpointed); @@ -3098,6 +3278,9 @@ static struct proc_dir_entry *my_proc_entry; static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev) { struct yaffs_param *param = &dev->param; + int bs[10]; + + yaffs_count_blocks_by_state(dev,bs); buf += sprintf(buf, "start_block.......... %d\n", param->start_block); buf += sprintf(buf, "end_block............ %d\n", param->end_block); @@ -3111,6 +3294,8 @@ static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev) param->empty_lost_n_found); buf += sprintf(buf, "disable_lazy_load.... %d\n", param->disable_lazy_load); + buf += sprintf(buf, "disable_bad_block_mrk %d\n", + param->disable_bad_block_marking); buf += sprintf(buf, "refresh_period....... %d\n", param->refresh_period); buf += sprintf(buf, "n_caches............. %d\n", param->n_caches); @@ -3119,6 +3304,11 @@ static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev) buf += sprintf(buf, "always_check_erased.. %d\n", param->always_check_erased); buf += sprintf(buf, "\n"); + buf += sprintf(buf, "block count by state\n"); + buf += sprintf(buf, "0:%d 1:%d 2:%d 3:%d 4:%d\n", + bs[0], bs[1], bs[2], bs[3], bs[4]); + buf += sprintf(buf, "5:%d 6:%d 7:%d 8:%d 9:%d\n", + bs[5], bs[6], bs[7], bs[8], bs[9]); return buf; } @@ -3192,9 +3382,7 @@ static int yaffs_proc_read(char *page, /* Print header first */ if (step == 0) buf += - sprintf(buf, - "Multi-version YAFFS built:" __DATE__ " " __TIME__ - "\n"); + sprintf(buf, "Multi-version YAFFS\n"); else if (step == 1) buf += sprintf(buf, "\n"); else { @@ -3273,7 +3461,7 @@ static struct { #define MAX_MASK_NAME_LENGTH 40 static int yaffs_proc_write_trace_options(struct file *file, const char *buf, - unsigned long count, void *data) + unsigned long count) { unsigned rg = 0, mask_bitfield; char *end; @@ -3368,10 +3556,99 @@ static int yaffs_proc_write_trace_options(struct file *file, const char *buf, return count; } +/* Debug strings are of the form: + * .bnnn print info on block n + * .cobjn,chunkn print nand chunk id for objn:chunkn + */ + +static int yaffs_proc_debug_write(struct file *file, const char *buf, + unsigned long count) +{ + + char str[100]; + char *p0; + char *p1; + long p1_val; + long p0_val; + char cmd; + struct list_head *item; + + memset(str, 0, sizeof(str)); + memcpy(str, buf, min((size_t)count, sizeof(str) -1)); + + cmd = str[1]; + + p0 = str + 2; + + p1 = p0; + + while (*p1 && *p1 != ',') { + p1++; + } + *p1 = '\0'; + p1++; + + p0_val = simple_strtol(p0, NULL, 0); + p1_val = simple_strtol(p1, NULL, 0); + + + mutex_lock(&yaffs_context_lock); + + /* Locate and print the Nth entry. Order N-squared but N is small. */ + list_for_each(item, &yaffs_context_list) { + struct yaffs_linux_context *dc = + list_entry(item, struct yaffs_linux_context, + context_list); + struct yaffs_dev *dev = dc->dev; + + if (cmd == 'b') { + struct yaffs_block_info *bi; + + bi = yaffs_get_block_info(dev,p0_val); + + if(bi) { + printk("Block %d: state %d, retire %d, use %d, seq %d\n", + (int)p0_val, bi->block_state, + bi->needs_retiring, bi->pages_in_use, + bi->seq_number); + } + } else if (cmd == 'c') { + struct yaffs_obj *obj; + int nand_chunk; + + obj = yaffs_find_by_number(dev, p0_val); + if (!obj) + printk("No obj %d\n", (int)p0_val); + else { + if(p1_val == 0) + nand_chunk = obj->hdr_chunk; + else + nand_chunk = + yaffs_find_chunk_in_file(obj, + p1_val, NULL); + printk("Nand chunk for %d:%d is %d\n", + (int)p0_val, (int)p1_val, nand_chunk); + } + } + } + + mutex_unlock(&yaffs_context_lock); + + return count; +} + + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)) static int yaffs_proc_write(struct file *file, const char *buf, - unsigned long count, void *data) + unsigned long count, void *ppos) +#else +static ssize_t yaffs_proc_write(struct file *file, const char __user *buf, + size_t count, loff_t *ppos) +#endif { - return yaffs_proc_write_trace_options(file, buf, count, data); + if (buf[0] == '.') + return yaffs_proc_debug_write(file, buf, count); + return yaffs_proc_write_trace_options(file, buf, count); } /* Stuff to handle installation of file systems */ @@ -3386,16 +3663,52 @@ static struct file_system_to_install fs_to_install[] = { {NULL, 0} }; -static int __init init_yaffs_fs(void) + +#ifdef YAFFS_NEW_PROCFS +static int yaffs_proc_show(struct seq_file *m, void *v) { - int error = 0; - struct file_system_to_install *fsinst; + /* FIXME: Unify in a better way? */ + char buffer[512]; + char *start; + int len; - yaffs_trace(YAFFS_TRACE_ALWAYS, - "yaffs built " __DATE__ " " __TIME__ " Installing."); + len = yaffs_proc_read(buffer, &start, 0, sizeof(buffer), NULL, NULL); + seq_puts(m, buffer); + return 0; +} + +static int yaffs_proc_open(struct inode *inode, struct file *file) +{ + return single_open(file, yaffs_proc_show, NULL); +} + +static struct file_operations procfs_ops = { + .owner = THIS_MODULE, + .open = yaffs_proc_open, + .read = seq_read, + .write = yaffs_proc_write, +}; + +static int yaffs_procfs_init(void) +{ + /* Install the proc_fs entries */ + my_proc_entry = proc_create("yaffs", + S_IRUGO | S_IFREG, + YPROC_ROOT, + &procfs_ops); + + if (my_proc_entry) { + return 0; + } else { + return -ENOMEM; + } +} + +#else - mutex_init(&yaffs_context_lock); +static int yaffs_procfs_init(void) +{ /* Install the proc_fs entries */ my_proc_entry = create_proc_entry("yaffs", S_IRUGO | S_IFREG, YPROC_ROOT); @@ -3404,9 +3717,28 @@ static int __init init_yaffs_fs(void) my_proc_entry->write_proc = yaffs_proc_write; my_proc_entry->read_proc = yaffs_proc_read; my_proc_entry->data = NULL; + return 0; } else { return -ENOMEM; - } + } +} + +#endif + + +static int __init init_yaffs_fs(void) +{ + int error = 0; + struct file_system_to_install *fsinst; + + yaffs_trace(YAFFS_TRACE_ALWAYS, + "yaffs Installing."); + + mutex_init(&yaffs_context_lock); + + error = yaffs_procfs_init(); + if (error) + return error; /* Now add the file system entries */ @@ -3441,7 +3773,7 @@ static void __exit exit_yaffs_fs(void) struct file_system_to_install *fsinst; yaffs_trace(YAFFS_TRACE_ALWAYS, - "yaffs built " __DATE__ " " __TIME__ " removing."); + "yaffs removing."); remove_proc_entry("yaffs", YPROC_ROOT); @@ -3457,8 +3789,8 @@ static void __exit exit_yaffs_fs(void) } module_init(init_yaffs_fs) - module_exit(exit_yaffs_fs) +module_exit(exit_yaffs_fs) - MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system"); +MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system"); MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2011"); MODULE_LICENSE("GPL");