From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 5/8] xfs: minor cleanup for xfs_get_blocks
Date: Tue, 13 Mar 2018 15:35:58 +0100 [thread overview]
Message-ID: <20180313143601.30028-6-hch@lst.de> (raw)
In-Reply-To: <20180313143601.30028-1-hch@lst.de>
Simplify the control flow a bit in preparation for O_ATOMIC-related
changes.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/xfs_aops.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index c79a3ca20ef8..19eadc807056 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -1335,17 +1335,16 @@ xfs_get_blocks(
&nimaps, 0);
if (error)
goto out_unlock;
-
- if (nimaps) {
- trace_xfs_get_blocks_found(ip, offset, size,
- imap.br_state == XFS_EXT_UNWRITTEN ?
- XFS_IO_UNWRITTEN : XFS_IO_OVERWRITE, &imap);
- xfs_iunlock(ip, lockmode);
- } else {
+ if (!nimaps) {
trace_xfs_get_blocks_notfound(ip, offset, size);
goto out_unlock;
}
+ trace_xfs_get_blocks_found(ip, offset, size,
+ imap.br_state == XFS_EXT_UNWRITTEN ?
+ XFS_IO_UNWRITTEN : XFS_IO_OVERWRITE, &imap);
+ xfs_iunlock(ip, lockmode);
+
/* trim mapping down to size requested */
xfs_map_trim_size(inode, iblock, bh_result, &imap, offset, size);
--
2.14.2
next prev parent reply other threads:[~2018-03-13 14:36 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-13 14:35 misc fixes and cleanups Christoph Hellwig
2018-03-13 14:35 ` [PATCH 1/8] xfs: fix the check for COW extents in xfs_swap_extents Christoph Hellwig
2018-03-13 20:42 ` Darrick J. Wong
2018-03-13 14:35 ` [PATCH 2/8] xfs: don't use XFS_BMAPI_ENTRIRE in xfs_get_blocks Christoph Hellwig
2018-03-13 20:44 ` Darrick J. Wong
2018-03-13 14:35 ` [PATCH 3/8] xfs: assert that xfs_reflink_allocate_cow is called with XFS_ILOCK_EXCL Christoph Hellwig
2018-03-13 20:45 ` Darrick J. Wong
2018-03-13 14:35 ` [PATCH 4/8] xfs: remove xfs_zero_range Christoph Hellwig
2018-03-13 20:45 ` Darrick J. Wong
2018-03-13 14:35 ` Christoph Hellwig [this message]
2018-03-13 20:45 ` [PATCH 5/8] xfs: minor cleanup for xfs_get_blocks Darrick J. Wong
2018-03-13 14:35 ` [PATCH 6/8] xfs: minor cleanup for xfs_reflink_end_cow Christoph Hellwig
2018-03-13 20:46 ` Darrick J. Wong
2018-03-13 14:36 ` [PATCH 7/8] xfs: mark xfs_reflink_clear_inode_flag static Christoph Hellwig
2018-03-13 20:50 ` Darrick J. Wong
2018-03-14 8:42 ` Christoph Hellwig
2018-03-13 14:36 ` [PATCH 8/8] xfs: only clear preallocated COW blocks in xfs_reflink_clear_inode_flag Christoph Hellwig
2018-03-13 20:56 ` Darrick J. Wong
2018-03-14 8:42 ` Christoph Hellwig
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=20180313143601.30028-6-hch@lst.de \
--to=hch@lst.de \
--cc=linux-xfs@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).