From: Christoph Hellwig <hch@lst.de>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 15/19] pnfs/blocklayout: don't set pages uptodate
Date: Thu, 21 Aug 2014 11:09:31 -0500 [thread overview]
Message-ID: <1408637375-11343-16-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1408637375-11343-1-git-send-email-hch@lst.de>
The core nfs code handles setting pages uptodate on reads, no need to mess
with the pageflags outselves. Also remove a debug function to dump page
flags.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/nfs/blocklayout/blocklayout.c | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index 6484b9f..92be984 100644
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -49,20 +49,6 @@ MODULE_LICENSE("GPL");
MODULE_AUTHOR("Andy Adamson <andros@citi.umich.edu>");
MODULE_DESCRIPTION("The NFSv4.1 pNFS Block layout driver");
-static void print_page(struct page *page)
-{
- dprintk("PRINTPAGE page %p\n", page);
- dprintk(" PagePrivate %d\n", PagePrivate(page));
- dprintk(" PageUptodate %d\n", PageUptodate(page));
- dprintk(" PageError %d\n", PageError(page));
- dprintk(" PageDirty %d\n", PageDirty(page));
- dprintk(" PageReferenced %d\n", PageReferenced(page));
- dprintk(" PageLocked %d\n", PageLocked(page));
- dprintk(" PageWriteback %d\n", PageWriteback(page));
- dprintk(" PageMappedToDisk %d\n", PageMappedToDisk(page));
- dprintk("\n");
-}
-
/* Given the be associated with isect, determine if page data needs to be
* initialized.
*/
@@ -187,16 +173,9 @@ retry:
return bio;
}
-/* This is basically copied from mpage_end_io_read */
static void bl_end_io_read(struct bio *bio, int err)
{
struct parallel_io *par = bio->bi_private;
- struct bio_vec *bvec;
- int i;
-
- if (!err)
- bio_for_each_segment_all(bvec, bio, i)
- SetPageUptodate(bvec->bv_page);
if (err) {
struct nfs_pgio_header *header = par->data;
@@ -205,6 +184,7 @@ static void bl_end_io_read(struct bio *bio, int err)
header->pnfs_error = -EIO;
pnfs_set_lo_fail(header->lseg);
}
+
bio_put(bio);
put_parallel(par);
}
@@ -304,8 +284,6 @@ bl_read_pagelist(struct nfs_pgio_header *hdr)
/* Fill hole w/ zeroes w/o accessing device */
dprintk("%s Zeroing page for hole\n", __func__);
zero_user_segment(pages[i], pg_offset, pg_len);
- print_page(pages[i]);
- SetPageUptodate(pages[i]);
} else {
struct pnfs_block_extent *be_read;
--
1.9.1
next prev parent reply other threads:[~2014-08-21 16:07 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <pnfs block layout driver fixes V2>
2014-08-21 16:09 ` Christoph Hellwig
2014-08-21 16:09 ` [PATCH 01/19] nfs: cap request size to fit a kmalloced page array Christoph Hellwig
2014-08-21 16:09 ` [PATCH 02/19] pnfs: do not pass uninitialized lsegs to ->free_lseg Christoph Hellwig
2014-08-21 16:09 ` [PATCH 03/19] pnfs: force a layout commit when encountering busy segments during recall Christoph Hellwig
2014-08-24 17:49 ` Boaz Harrosh
2014-08-24 19:18 ` Christoph Hellwig
2014-08-26 14:10 ` [PATCH] pnfs: Kick a pnfs_layoutcommit_inode on recall Boaz Harrosh
2014-08-26 14:26 ` Trond Myklebust
2014-08-26 14:37 ` Boaz Harrosh
2014-08-26 14:52 ` Boaz Harrosh
2014-08-26 14:55 ` Trond Myklebust
2014-08-26 15:02 ` Boaz Harrosh
2014-08-26 15:24 ` Matt W. Benjamin
2014-08-26 15:36 ` Trond Myklebust
2014-08-26 16:56 ` Boaz Harrosh
2014-08-26 16:59 ` Trond Myklebust
2014-08-26 17:06 ` Boaz Harrosh
2014-08-26 17:54 ` Trond Myklebust
2014-08-26 18:19 ` Boaz Harrosh
2014-08-26 18:34 ` Boaz Harrosh
2014-08-26 18:41 ` Trond Myklebust
2014-08-26 19:46 ` Trond Myklebust
2014-08-27 8:50 ` Boaz Harrosh
2014-08-27 8:22 ` Boaz Harrosh
2014-09-09 0:37 ` [PATCH 03/19] pnfs: force a layout commit when encountering busy segments during recall Trond Myklebust
2014-09-09 5:49 ` Christoph Hellwig
2014-09-09 14:38 ` Trond Myklebust
2014-08-21 16:09 ` [PATCH 04/19] pnfs: don't check sequence on new stateids in layoutget Christoph Hellwig
2014-08-21 16:09 ` [PATCH 05/19] pnfs: retry after a bad stateid error from layoutget Christoph Hellwig
2014-08-21 16:09 ` [PATCH 06/19] pnfs: avoid using stale stateids after layoutreturn Christoph Hellwig
2014-08-21 16:09 ` [PATCH 07/19] pnfs: add flag to force read-modify-write in ->write_begin Christoph Hellwig
2014-09-09 3:50 ` Trond Myklebust
2014-09-09 5:53 ` Christoph Hellwig
2014-09-09 14:41 ` Trond Myklebust
2014-08-21 16:09 ` [PATCH 08/19] pnfs: add return_range method Christoph Hellwig
2014-08-25 13:50 ` Anna Schumaker
2014-08-25 14:09 ` Christoph Hellwig
2014-08-25 14:17 ` Anna Schumaker
2014-08-25 14:20 ` Christoph Hellwig
2014-09-09 3:57 ` Trond Myklebust
2014-08-21 16:09 ` [PATCH 09/19] pnfs: allow splicing pre-encoded pages into the layoutcommit args Christoph Hellwig
2014-08-21 16:09 ` [PATCH 10/19] pnfs/blocklayout: reject pnfs blocksize larger than page size Christoph Hellwig
2014-08-21 16:09 ` [PATCH 11/19] pnfs/blocklayout: improve GETDEVICEINFO error reporting Christoph Hellwig
2014-08-21 16:09 ` [PATCH 12/19] pnfs/blocklayout: plug block queues Christoph Hellwig
2014-08-21 16:09 ` [PATCH 13/19] pnfs/blocklayout: correctly decrement extent length Christoph Hellwig
2015-02-09 6:01 ` NeilBrown
2015-02-09 18:24 ` Christoph Hellwig
2014-08-21 16:09 ` [PATCH 14/19] pnfs/blocklayout: remove read-modify-write handling in bl_write_pagelist Christoph Hellwig
2014-09-09 4:43 ` Trond Myklebust
2014-08-21 16:09 ` Christoph Hellwig [this message]
2014-09-09 4:48 ` [PATCH 15/19] pnfs/blocklayout: don't set pages uptodate Trond Myklebust
2014-08-21 16:09 ` [PATCH 16/19] pnfs/blocklayout: rewrite extent tracking Christoph Hellwig
2014-08-25 14:36 ` Anna Schumaker
2014-08-25 14:43 ` Christoph Hellwig
2014-08-26 9:06 ` Boaz Harrosh
2014-09-09 4:50 ` Trond Myklebust
2014-08-21 16:09 ` [PATCH 17/19] pnfs/blocklayout: implement the return_range method Christoph Hellwig
2014-09-09 4:03 ` Trond Myklebust
2014-08-21 16:09 ` [PATCH 18/19] pnfs/blocklayout: return layouts on setattr Christoph Hellwig
2014-09-09 4:09 ` Trond Myklebust
2014-08-21 16:09 ` [PATCH 19/19] pnfs/blocklayout: allocate separate pages for the layoutcommit payload Christoph Hellwig
2014-09-09 4:52 ` Trond Myklebust
2014-08-21 16:13 ` pnfs block layout driver fixes V2 Christoph Hellwig
2014-09-09 4:12 ` Trond Myklebust
2014-09-09 5:54 ` Christoph Hellwig
2014-09-09 14:40 ` Trond Myklebust
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=1408637375-11343-16-git-send-email-hch@lst.de \
--to=hch@lst.de \
--cc=linux-nfs@vger.kernel.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).