summaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorArtem Bityutskiy2008-12-09 17:02:51 +0100
committerArtem Bityutskiy2008-12-23 11:19:14 +0100
commit7bbe5b5aa6d1e38af6f1fc866efc0aa461d73f19 (patch)
treef9cd48adda1b832c77a7cca63534a4fce2648546 /fs/ubifs
parentUBIFS: fix section mismatch (diff)
downloadkernel-qcow2-linux-7bbe5b5aa6d1e38af6f1fc866efc0aa461d73f19.tar.gz
kernel-qcow2-linux-7bbe5b5aa6d1e38af6f1fc866efc0aa461d73f19.tar.xz
kernel-qcow2-linux-7bbe5b5aa6d1e38af6f1fc866efc0aa461d73f19.zip
UBIFS: use PAGE_CACHE_MASK correctly
It has high bits set, not low bits set as the UBIFS code assumed. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs/ubifs')
-rw-r--r--fs/ubifs/file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 2624411d9758..7f1de98e6091 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -254,7 +254,7 @@ static int write_begin_slow(struct address_space *mapping,
}
if (!PageUptodate(page)) {
- if (!(pos & PAGE_CACHE_MASK) && len == PAGE_CACHE_SIZE)
+ if (!(pos & ~PAGE_CACHE_MASK) && len == PAGE_CACHE_SIZE)
SetPageChecked(page);
else {
err = do_readpage(page);
@@ -444,7 +444,7 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,
if (!PageUptodate(page)) {
/* The page is not loaded from the flash */
- if (!(pos & PAGE_CACHE_MASK) && len == PAGE_CACHE_SIZE)
+ if (!(pos & ~PAGE_CACHE_MASK) && len == PAGE_CACHE_SIZE)
/*
* We change whole page so no need to load it. But we
* have to set the @PG_checked flag to make the further