From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH 05/18] xfs: move locking into xfs_bmap_punch_delalloc_range
Date: Wed, 30 May 2018 12:00:00 +0200 [thread overview]
Message-ID: <20180530100013.31358-6-hch@lst.de> (raw)
In-Reply-To: <20180530100013.31358-1-hch@lst.de>
Both callers want the same looking, so do it only once.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/xfs_aops.c | 2 --
fs/xfs/xfs_bmap_util.c | 7 ++++---
fs/xfs/xfs_iomap.c | 3 ---
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index f2333e351e07..5dd09e83c81c 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -761,10 +761,8 @@ xfs_aops_discard_page(
"page discard on page "PTR_FMT", inode 0x%llx, offset %llu.",
page, ip->i_ino, offset);
- xfs_ilock(ip, XFS_ILOCK_EXCL);
error = xfs_bmap_punch_delalloc_range(ip, start_fsb,
PAGE_SIZE / i_blocksize(inode));
- xfs_iunlock(ip, XFS_ILOCK_EXCL);
if (error && !XFS_FORCED_SHUTDOWN(mp))
xfs_alert(mp, "page discard unable to remove delalloc mapping.");
out_invalidate:
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index f2b87873612d..86a7ee425bfc 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -712,12 +712,11 @@ xfs_bmap_punch_delalloc_range(
struct xfs_iext_cursor icur;
int error = 0;
- ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
-
+ xfs_ilock(ip, XFS_ILOCK_EXCL);
if (!(ifp->if_flags & XFS_IFEXTENTS)) {
error = xfs_iread_extents(NULL, ip, XFS_DATA_FORK);
if (error)
- return error;
+ goto out_unlock;
}
if (!xfs_iext_lookup_extent_before(ip, ifp, &end_fsb, &icur, &got))
@@ -738,6 +737,8 @@ xfs_bmap_punch_delalloc_range(
}
}
+out_unlock:
+ xfs_iunlock(ip, XFS_ILOCK_EXCL);
return error;
}
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index da6d1995e460..f949f0dd7382 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -1203,11 +1203,8 @@ xfs_file_iomap_end_delalloc(
truncate_pagecache_range(VFS_I(ip), XFS_FSB_TO_B(mp, start_fsb),
XFS_FSB_TO_B(mp, end_fsb) - 1);
- xfs_ilock(ip, XFS_ILOCK_EXCL);
error = xfs_bmap_punch_delalloc_range(ip, start_fsb,
end_fsb - start_fsb);
- xfs_iunlock(ip, XFS_ILOCK_EXCL);
-
if (error && !XFS_FORCED_SHUTDOWN(mp)) {
xfs_alert(mp, "%s: unable to clean up ino %lld",
__func__, ip->i_ino);
--
2.17.0
next prev parent reply other threads:[~2018-05-30 10:00 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-30 9:59 buffered writes without buffer heads in xfs and iomap v4 Christoph Hellwig
2018-05-30 9:59 ` [PATCH 01/18] fs: factor out a __generic_write_end helper Christoph Hellwig
2018-05-30 13:34 ` Brian Foster
2018-05-30 16:26 ` Darrick J. Wong
2018-05-30 9:59 ` [PATCH 02/18] iomap: add initial support for writes without buffer heads Christoph Hellwig
2018-05-30 13:34 ` Brian Foster
2018-05-30 16:33 ` Darrick J. Wong
2018-05-30 9:59 ` [PATCH 03/18] xfs: simplify xfs_bmap_punch_delalloc_range Christoph Hellwig
2018-05-30 13:35 ` Brian Foster
2018-05-30 16:55 ` Darrick J. Wong
2018-05-30 9:59 ` [PATCH 04/18] xfs: simplify xfs_aops_discard_page Christoph Hellwig
2018-05-30 13:35 ` Brian Foster
2018-05-30 16:40 ` Darrick J. Wong
2018-05-30 10:00 ` Christoph Hellwig [this message]
2018-05-30 13:35 ` [PATCH 05/18] xfs: move locking into xfs_bmap_punch_delalloc_range Brian Foster
2018-05-30 16:58 ` Darrick J. Wong
2018-05-30 17:40 ` Brian Foster
2018-05-30 10:00 ` [PATCH 06/18] xfs: make xfs_writepage_map extent map centric Christoph Hellwig
2018-05-30 17:19 ` Darrick J. Wong
2018-05-30 17:39 ` Brian Foster
2018-05-31 16:11 ` Christoph Hellwig
2018-05-31 16:12 ` Christoph Hellwig
2018-05-30 10:00 ` [PATCH 07/18] xfs: remove the now unused XFS_BMAPI_IGSTATE flag Christoph Hellwig
2018-05-30 17:19 ` Darrick J. Wong
2018-05-31 13:46 ` Brian Foster
2018-05-31 16:11 ` Christoph Hellwig
2018-05-30 10:00 ` [PATCH 08/18] xfs: remove xfs_reflink_find_cow_mapping Christoph Hellwig
2018-05-30 17:23 ` Darrick J. Wong
2018-05-31 13:46 ` Brian Foster
2018-05-30 10:00 ` [PATCH 09/18] xfs: remove xfs_reflink_trim_irec_to_next_cow Christoph Hellwig
2018-05-30 17:27 ` Darrick J. Wong
2018-05-31 13:46 ` Brian Foster
2018-05-30 10:00 ` [PATCH 10/18] xfs: simplify xfs_map_blocks by using xfs_iext_lookup_extent directly Christoph Hellwig
2018-05-30 17:32 ` Darrick J. Wong
2018-05-31 13:46 ` Brian Foster
2018-05-30 10:00 ` [PATCH 11/18] xfs: don't clear imap_valid for a non-uptodate buffers Christoph Hellwig
2018-05-30 17:34 ` Darrick J. Wong
2018-05-31 13:46 ` Brian Foster
2018-05-30 10:00 ` [PATCH 12/18] xfs: remove the imap_valid flag Christoph Hellwig
2018-05-30 17:44 ` Darrick J. Wong
2018-05-31 13:47 ` Brian Foster
2018-05-30 10:00 ` [PATCH 13/18] xfs: don't look at buffer heads in xfs_add_to_ioend Christoph Hellwig
2018-05-30 17:55 ` Darrick J. Wong
2018-05-31 7:03 ` Christoph Hellwig
2018-05-31 13:49 ` Brian Foster
2018-05-30 10:00 ` [PATCH 14/18] xfs: move all writeback buffer_head manipulation into xfs_map_at_offset Christoph Hellwig
2018-05-30 17:56 ` Darrick J. Wong
2018-05-31 13:49 ` Brian Foster
2018-05-30 10:00 ` [PATCH 15/18] xfs: remove xfs_start_page_writeback Christoph Hellwig
2018-05-30 17:57 ` Darrick J. Wong
2018-05-31 13:49 ` Brian Foster
2018-05-30 10:00 ` [PATCH 16/18] xfs: refactor the tail of xfs_writepage_map Christoph Hellwig
2018-05-30 18:00 ` Darrick J. Wong
2018-05-31 13:49 ` Brian Foster
2018-05-30 10:00 ` [PATCH 17/18] xfs: do not set the page uptodate in xfs_writepage_map Christoph Hellwig
2018-05-30 18:08 ` Darrick J. Wong
2018-05-31 7:04 ` Christoph Hellwig
2018-05-31 13:49 ` Brian Foster
2018-05-30 10:00 ` [PATCH 18/18] xfs: allow writeback on pages without buffer heads Christoph Hellwig
2018-05-30 18:08 ` Darrick J. Wong
2018-05-31 13:49 ` Brian Foster
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=20180530100013.31358-6-hch@lst.de \
--to=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--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).