From: Christoph Hellwig <hch@infradead.org>
To: Dave Chinner <david@fromorbit.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 05/32] xfs: remove xfs_flushinval_pages
Date: Thu, 15 Nov 2012 11:28:07 -0500 [thread overview]
Message-ID: <20121115162807.GE4019@infradead.org> (raw)
In-Reply-To: <1352721264-3700-6-git-send-email-david@fromorbit.com>
> - if ((iocb->ki_pos & target->bt_smask) ||
> - (size & target->bt_smask)) {
> - if (iocb->ki_pos == i_size_read(inode))
> + if ((pos & target->bt_smask) || (size & target->bt_smask)) {
> + if (pos == i_size_read(inode))
> return 0;
> return -XFS_ERROR(EINVAL);
> }
> }
>
> - n = mp->m_super->s_maxbytes - iocb->ki_pos;
> + n = mp->m_super->s_maxbytes - pos;
What does this have to do with the recent of the patch?
Not that is diapprove, but I don't think it fits here.
> if (inode->i_mapping->nrpages) {
> - ret = -xfs_flushinval_pages(ip,
> - (iocb->ki_pos & PAGE_CACHE_MASK),
> - -1, FI_REMAPF_LOCKED);
> + ret = -filemap_write_and_wait_range(
> + VFS_I(ip)->i_mapping,
> + pos, -1);
> if (ret) {
> xfs_rw_iunlock(ip, XFS_IOLOCK_EXCL);
> return ret;
> }
> + truncate_pagecache_range(VFS_I(ip), pos, -1);
We already have a local "inode" variable that can be used in these two
places.
Also the -1 end might be a 1:1 translation of what was there, but is not what
we really want. At very least it needs an XXX comment that the range should
be revisited.
> @@ -670,10 +670,11 @@ xfs_file_dio_aio_write(
> goto out;
>
> if (mapping->nrpages) {
> - ret = -xfs_flushinval_pages(ip, (pos & PAGE_CACHE_MASK), -1,
> - FI_REMAPF_LOCKED);
> + ret = -filemap_write_and_wait_range(VFS_I(ip)->i_mapping,
> + pos, -1);
> if (ret)
> goto out;
> + truncate_pagecache_range(VFS_I(ip), pos, -1);
We already have local mapping and inode variables here, same comment
about the -1 len.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2012-11-15 16:26 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-12 11:53 [PATCH 00/32] xfs: current queue for 3.8 Dave Chinner
2012-11-12 11:53 ` [PATCH 01/32] xfs: add more attribute tree trace points Dave Chinner
2012-11-12 22:11 ` Mark Tinguely
2012-11-15 16:18 ` Christoph Hellwig
2012-11-12 11:53 ` [PATCH 02/32] xfs: remove xfs_tosspages Dave Chinner
2012-11-14 6:42 ` [PATCH 02/32 V2] " Dave Chinner
2012-11-14 18:50 ` Andrew Dahl
2012-11-14 18:52 ` [PATCH 02.5/32] " Andrew Dahl
2012-11-14 19:59 ` Mark Tinguely
2012-11-21 8:05 ` Dave Chinner
2012-11-22 5:10 ` Andrew Dahl
2012-11-22 23:29 ` Dave Chinner
2012-11-26 18:04 ` Andrew Dahl
2012-11-14 21:17 ` [PATCH 02/32 V2] " Dave Chinner
2012-11-15 16:22 ` Christoph Hellwig
2012-11-12 11:53 ` [PATCH 03/32] xfs: remove xfs_wait_on_pages() Dave Chinner
2012-11-15 16:23 ` Christoph Hellwig
2012-11-12 11:53 ` [PATCH 04/32] xfs: remove xfs_flush_pages Dave Chinner
2012-11-15 16:24 ` Christoph Hellwig
2012-11-12 11:53 ` [PATCH 05/32] xfs: remove xfs_flushinval_pages Dave Chinner
2012-11-15 16:28 ` Christoph Hellwig [this message]
2012-11-15 20:54 ` Dave Chinner
2012-11-21 10:12 ` Christoph Hellwig
2012-11-12 11:53 ` [PATCH 06/32] xfs: use btree block initialisation functions in growfs Dave Chinner
2012-11-13 21:18 ` Rich Johnston
2012-11-23 12:40 ` Christoph Hellwig
2012-11-23 21:25 ` Dave Chinner
2012-11-12 11:53 ` [PATCH 07/32] xfs: growfs: use uncached buffers for new headers Dave Chinner
2012-11-13 21:18 ` Rich Johnston
2012-11-12 11:54 ` [PATCH 08/32] xfs: make growfs initialise the AGFL header Dave Chinner
2012-11-13 21:18 ` Rich Johnston
2012-11-23 12:41 ` Christoph Hellwig
2012-11-23 21:27 ` Dave Chinner
2012-11-12 11:54 ` [PATCH 09/32] xfs: make buffer read verication an IO completion function Dave Chinner
2012-11-12 11:54 ` [PATCH 10/32] xfs: uncached buffer reads need to return an error Dave Chinner
2012-11-12 11:54 ` [PATCH 11/32] xfs: verify superblocks as they are read from disk Dave Chinner
2012-11-23 12:42 ` Christoph Hellwig
2012-11-12 11:54 ` [PATCH 12/32] xfs: verify AGF blocks " Dave Chinner
2012-11-13 1:09 ` Phil White
2012-11-13 3:07 ` Dave Chinner
2012-11-14 6:44 ` [PATCH 12/32 V2] " Dave Chinner
2012-11-14 21:28 ` Mark Tinguely
2012-11-12 11:54 ` [PATCH 13/32] xfs: verify AGI " Dave Chinner
2012-11-12 11:54 ` [PATCH 14/32] xfs: verify AGFL " Dave Chinner
2012-11-12 11:54 ` [PATCH 15/32] xfs: verify inode buffers " Dave Chinner
2012-11-12 11:54 ` [PATCH 16/32] xfs: verify btree blocks " Dave Chinner
2012-11-12 11:54 ` [PATCH 17/32] xfs: verify dquot " Dave Chinner
2012-11-14 6:50 ` [PATCH 17/32 V2] " Dave Chinner
2012-11-15 17:55 ` Mark Tinguely
2012-11-15 20:48 ` Dave Chinner
2012-11-15 21:01 ` Mark Tinguely
2012-11-15 21:16 ` Dave Chinner
2012-11-15 21:34 ` Mark Tinguely
2012-11-15 22:01 ` Dave Chinner
2012-11-15 22:09 ` Dave Chinner
2012-11-15 22:26 ` Mark Tinguely
2012-11-15 22:33 ` Dave Chinner
2012-11-16 1:22 ` Dave Chinner
2012-11-12 11:54 ` [PATCH 18/32] xfs: add verifier callback to directory read code Dave Chinner
2012-11-12 11:54 ` [PATCH 19/32] xfs: factor dir2 block read operations Dave Chinner
2012-11-15 3:09 ` Ben Myers
2012-11-15 5:59 ` Dave Chinner
2012-11-12 11:54 ` [PATCH 20/32] xfs: verify dir2 block format buffers Dave Chinner
2012-11-12 11:54 ` [PATCH 21/32] xfs: factor dir2 free block reading Dave Chinner
2012-11-12 11:54 ` [PATCH 22/32] xfs: factor out dir2 data " Dave Chinner
2012-11-12 11:54 ` [PATCH 23/32] xfs: factor dir2 leaf read Dave Chinner
2012-11-12 11:54 ` [PATCH 24/32] xfs: factor and verify attr leaf reads Dave Chinner
2012-11-12 11:54 ` [PATCH 25/32] xfs: add xfs_da_node verification Dave Chinner
2012-11-12 11:54 ` [PATCH 26/32] xfs: Add verifiers to dir2 data readahead Dave Chinner
2012-11-12 11:54 ` [PATCH 27/32] xfs: add buffer pre-write callback Dave Chinner
2012-11-15 6:02 ` [PATCH 27/32 REPOST] " Dave Chinner
2012-11-12 11:54 ` [PATCH 28/32] xfs: add pre-write metadata buffer verifier callbacks Dave Chinner
2012-11-14 6:52 ` [PATCH 28/32 V2] " Dave Chinner
2012-11-14 22:23 ` Mark Tinguely
2012-11-12 11:54 ` [PATCH 29/32] xfs: connect up write verifiers to new buffers Dave Chinner
2012-11-14 6:53 ` [PATCH 29/32 V2] " Dave Chinner
2012-11-12 11:54 ` [PATCH 30/32] xfs: convert buffer verifiers to an ops structure Dave Chinner
2012-11-14 6:54 ` [PATCH 30/32 V2] " Dave Chinner
2012-11-12 11:54 ` [PATCH 31/32] xfs: add CRC infrastructure Dave Chinner
2012-11-12 15:37 ` Mark Tinguely
2012-11-15 22:20 ` [PATCH 31/32 V2] " Dave Chinner
2012-11-12 11:54 ` [PATCH 32/32] xfs: add CRC checks to the log Dave Chinner
2012-11-12 15:37 ` Mark Tinguely
2012-11-13 23:26 ` [PATCH 00/32] xfs: current queue for 3.8 Ben Myers
2012-11-14 6:02 ` Dave Chinner
2012-11-14 20:42 ` Ben Myers
2012-11-14 21:27 ` Ben Myers
2012-11-15 4:40 ` Ben Myers
2012-11-15 6:03 ` Dave Chinner
2012-11-16 4:31 ` Ben Myers
2012-11-20 2:27 ` Ben Myers
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=20121115162807.GE4019@infradead.org \
--to=hch@infradead.org \
--cc=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/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