From: Charles Manning Date: Fri, 7 Jan 2011 01:22:56 +0000 (+1300) Subject: Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2 X-Git-Tag: linux-mainline-patchset-4~5^2~3 X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=ae68942c23ba444fc820519ac25865ab38edc3c5;hp=caf4f0d199647715e398aa87ad4b35dd26413c92 Merge branch 'master' of ssh://aleph1.co.uk/home/aleph1/git/yaffs2 --- diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index e3bc19d..e4f6df0 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -650,13 +650,11 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir, /* got to the end of the string */ return dir; else{ - if(strcmp(str,_Y(".")) == 0) - { + if(strcmp(str,_Y(".")) == 0){ /* Do nothing */ - } - else if(strcmp(str,_Y("..")) == 0) + } else if(strcmp(str,_Y("..")) == 0) { dir = dir->parent; - else{ + } else{ dir = yaffs_find_by_name(dir,str); dir = yaffsfs_FollowLink(dir,symDepth,loop); diff --git a/yaffs_mtdif1_multi.c b/yaffs_mtdif1_multi.c index 603dc97..cf9c54c 100644 --- a/yaffs_mtdif1_multi.c +++ b/yaffs_mtdif1_multi.c @@ -238,7 +238,7 @@ int nandmtd1_read_chunk_tags(struct yaffs_dev *dev, deleted = !pt1.deleted; pt1.deleted = 1; #else - deleted = (yaffs_count_bits(((u8 *) & pt1)[8]) < 7); + deleted = (hweight8(((u8 *) & pt1)[8]) < 7); #endif /* Check the packed tags mini-ECC and correct if necessary/possible. diff --git a/yaffs_mtdif1_single.c b/yaffs_mtdif1_single.c index 5108369..740f7f6 100644 --- a/yaffs_mtdif1_single.c +++ b/yaffs_mtdif1_single.c @@ -207,7 +207,7 @@ int nandmtd1_read_chunk_tags(struct yaffs_dev *dev, deleted = !pt1.deleted; pt1.deleted = 1; #else - deleted = (yaffs_count_bits(((u8 *) & pt1)[8]) < 7); + deleted = (hweight8(((u8 *) & pt1)[8]) < 7); #endif /* Check the packed tags mini-ECC and correct if necessary/possible. diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c index 85df2d7..9feecdf 100644 --- a/yaffs_vfs_multi.c +++ b/yaffs_vfs_multi.c @@ -866,7 +866,7 @@ static void yaffs_evict_inode(struct inode *inode) 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")); + obj ? "object exists" : "null object"); if (!inode->i_nlink && !is_bad_inode(inode)) deleteme = 1; diff --git a/yaffs_vfs_single.c b/yaffs_vfs_single.c index d5b8753..2cd6047 100644 --- a/yaffs_vfs_single.c +++ b/yaffs_vfs_single.c @@ -59,9 +59,6 @@ #include -#define UnlockPage(p) unlock_page(p) -#define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags) - #define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) #define YPROC_ROOT NULL @@ -1177,7 +1174,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) static int yaffs_readpage_unlock(struct file *f, struct page *pg) { int ret = yaffs_readpage_nolock(f, pg); - UnlockPage(pg); + unlock_page(pg); return ret; } @@ -1334,7 +1331,7 @@ static int yaffs_write_begin(struct file *filp, struct address_space *mapping, } yaffs_trace(YAFFS_TRACE_OS, "start yaffs_write_begin index %d(%x) uptodate %d", - (int)index, (int)index, Page_Uptodate(pg) ? 1 : 0); + (int)index, (int)index, PageUptodate(pg) ? 1 : 0); /* Get fs space */ space_held = yaffs_hold_space(filp); @@ -1346,7 +1343,7 @@ static int yaffs_write_begin(struct file *filp, struct address_space *mapping, /* Update page if required */ - if (!Page_Uptodate(pg)) + if (!PageUptodate(pg)) ret = yaffs_readpage_nolock(filp, pg); if (ret) diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c index 9eb6030..c879f57 100644 --- a/yaffs_yaffs1.c +++ b/yaffs_yaffs1.c @@ -110,7 +110,6 @@ int yaffs1_scan(struct yaffs_dev *dev) */ deleted++; dev->n_free_chunks++; - /*T((" %d %d deleted\n",blk,c)); */ } else if (!tags.chunk_used) { /* An unassigned chunk in the block * This means that either the block is empty or @@ -178,7 +177,6 @@ int yaffs1_scan(struct yaffs_dev *dev) } } - /* T((" %d %d data %d %d\n",blk,c,tags.obj_id,tags.chunk_id)); */ } else { /* chunk_id == 0, so it is an ObjectHeader. * Thus, we read in the object header and make the object diff --git a/yportenv_multi.h b/yportenv_multi.h index 4dddf63..10e284e 100644 --- a/yportenv_multi.h +++ b/yportenv_multi.h @@ -24,7 +24,9 @@ #define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c)) +#ifdef YAFFS_OUT_OF_TREE #include "moduleconfig.h" +#endif #include #define MTD_VERSION_CODE LINUX_VERSION_CODE @@ -75,7 +77,7 @@ #endif #define yaffs_trace(msk, fmt, ...) do { \ - if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \ + if(yaffs_trace_mask & (msk)) \ printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \ } while(0) diff --git a/yportenv_single.h b/yportenv_single.h index 236f579..8183425 100644 --- a/yportenv_single.h +++ b/yportenv_single.h @@ -54,7 +54,7 @@ #endif #define yaffs_trace(msk, fmt, ...) do { \ - if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \ + if(yaffs_trace_mask & (msk)) \ printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \ } while(0)