From: Artem Bityutskiy <dedekind@infradead.org>
To: linux-fsdevel@vger.kernel.org
Cc: Adrian Hunter <ext-adrian.hunter@nokia.com>,
linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org
Subject: [PATCH] UBIFS: fix bulk-read handling uptodate pages
Date: Tue, 30 Sep 2008 12:19:15 +0300 [thread overview]
Message-ID: <1222766358-21886-20-git-send-email-dedekind@infradead.org> (raw)
In-Reply-To: <1222766358-21886-1-git-send-email-dedekind@infradead.org>
From: Adrian Hunter <ext-adrian.hunter@nokia.com>
Bulk-read skips uptodate pages but this was putting its
array index out and causing it to treat subsequent pages
as holes.
Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
---
fs/ubifs/file.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 2f20a49..51cf511 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -595,7 +595,7 @@ out:
static int populate_page(struct ubifs_info *c, struct page *page,
struct bu_info *bu, int *n)
{
- int i = 0, nn = *n, offs = bu->zbranch[0].offs, hole = 1, read = 0;
+ int i = 0, nn = *n, offs = bu->zbranch[0].offs, hole = 0, read = 0;
struct inode *inode = page->mapping->host;
loff_t i_size = i_size_read(inode);
unsigned int page_block;
@@ -609,6 +609,7 @@ static int populate_page(struct ubifs_info *c, struct page *page,
end_index = (i_size - 1) >> PAGE_CACHE_SHIFT;
if (!i_size || page->index > end_index) {
+ hole = 1;
memset(addr, 0, PAGE_CACHE_SIZE);
goto out_hole;
}
@@ -617,10 +618,10 @@ static int populate_page(struct ubifs_info *c, struct page *page,
while (1) {
int err, len, out_len, dlen;
- if (nn >= bu->cnt ||
- key_block(c, &bu->zbranch[nn].key) != page_block)
+ if (nn >= bu->cnt) {
+ hole = 1;
memset(addr, 0, UBIFS_BLOCK_SIZE);
- else {
+ } else if (key_block(c, &bu->zbranch[nn].key) == page_block) {
struct ubifs_data_node *dn;
dn = bu->buf + (bu->zbranch[nn].offs - offs);
@@ -643,8 +644,13 @@ static int populate_page(struct ubifs_info *c, struct page *page,
memset(addr + len, 0, UBIFS_BLOCK_SIZE - len);
nn += 1;
- hole = 0;
read = (i << UBIFS_BLOCK_SHIFT) + len;
+ } else if (key_block(c, &bu->zbranch[nn].key) < page_block) {
+ nn += 1;
+ continue;
+ } else {
+ hole = 1;
+ memset(addr, 0, UBIFS_BLOCK_SIZE);
}
if (++i >= UBIFS_BLOCKS_PER_PAGE)
break;
--
1.5.4.1
next prev parent reply other threads:[~2008-09-30 7:42 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-30 9:18 What is in ubifs-2.6.git Artem Bityutskiy
2008-09-30 7:56 ` Artem Bityutskiy
2008-09-30 8:55 ` Amit Kumar Sharma
2008-09-30 9:02 ` Artem Bityutskiy
2008-09-30 9:18 ` [PATCH] UBIFS: add a print, fix comments and more minor stuff Artem Bityutskiy
2008-09-30 9:18 ` [PATCH] UBIFS: remove unneeded unlikely() Artem Bityutskiy
2008-09-30 9:18 ` [PATCH] UBIFS: inline one-line functions Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: use an IS_ERR test rather than a NULL test Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: add bulk-read facility Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: add no_chk_data_crc mount option Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: improve znode splitting rules Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: check data CRC when in error state Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: use bit-fields when possible Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: correct key comparison Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: ensure data read beyond i_size is zeroed out correctly Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: fix races in bit-fields Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: fix commentary Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: update dbg_dump_inode Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: correct comment for commit_on_unmount Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: commit on sync_fs Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: allow for sync_fs when read-only Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: improve garbage collection Artem Bityutskiy
2008-09-30 9:19 ` Artem Bityutskiy [this message]
2008-09-30 9:19 ` [PATCH] UBIFS: add more debugging messages for LPT Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: correct condition to eliminate unecessary assignment Artem Bityutskiy
2008-09-30 9:19 ` [PATCH] UBIFS: check buffer length when scanning for LPT nodes Artem Bityutskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1222766358-21886-20-git-send-email-dedekind@infradead.org \
--to=dedekind@infradead.org \
--cc=ext-adrian.hunter@nokia.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).