From e8e45356bea4f0908c6366072a4c4dedd5f33b69 Mon Sep 17 00:00:00 2001 From: Charles Manning Date: Fri, 7 Jan 2011 14:08:21 +1300 Subject: [PATCH] yaffs: Strip pointless macro wrapping These wrapping helped nothing. Out... out! Signed-off-by: Charles Manning --- yaffs_vfs_single.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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) -- 2.30.2