All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] iomap: Make sure iomap_end is called after iomap_begin
@ 2020-06-15 16:02 Andreas Gruenbacher
  2020-06-15 23:32 ` Dave Chinner
  2020-06-18  1:39 ` Darrick J. Wong
  0 siblings, 2 replies; 18+ messages in thread
From: Andreas Gruenbacher @ 2020-06-15 16:02 UTC (permalink / raw)
  To: Christoph Hellwig, Darrick J . Wong, linux-xfs, linux-fsdevel
  Cc: Bob Peterson, Andreas Gruenbacher

Make sure iomap_end is always called when iomap_begin succeeds: the
filesystem may take locks in iomap_begin and release them in iomap_end,
for example.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
 fs/iomap/apply.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/iomap/apply.c b/fs/iomap/apply.c
index 76925b40b5fd..c00a14d825db 100644
--- a/fs/iomap/apply.c
+++ b/fs/iomap/apply.c
@@ -46,10 +46,10 @@ iomap_apply(struct inode *inode, loff_t pos, loff_t length, unsigned flags,
 	ret = ops->iomap_begin(inode, pos, length, flags, &iomap, &srcmap);
 	if (ret)
 		return ret;
-	if (WARN_ON(iomap.offset > pos))
-		return -EIO;
-	if (WARN_ON(iomap.length == 0))
-		return -EIO;
+	if (WARN_ON(iomap.offset > pos) || WARN_ON(iomap.length == 0)) {
+		written = -EIO;
+		goto out;
+	}
 
 	trace_iomap_apply_dstmap(inode, &iomap);
 	if (srcmap.type != IOMAP_HOLE)
@@ -80,6 +80,7 @@ iomap_apply(struct inode *inode, loff_t pos, loff_t length, unsigned flags,
 	written = actor(inode, pos, length, data, &iomap,
 			srcmap.type != IOMAP_HOLE ? &srcmap : &iomap);
 
+out:
 	/*
 	 * Now the data has been copied, commit the range we've copied.  This
 	 * should not fail unless the filesystem has had a fatal error.

base-commit: 97e0204907ac4c42c6e94ef466a047523f34b853
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2020-06-19 13:18 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-15 16:02 [PATCH] iomap: Make sure iomap_end is called after iomap_begin Andreas Gruenbacher
2020-06-15 23:32 ` Dave Chinner
2020-06-15 23:44   ` Matthew Wilcox
2020-06-16  0:39     ` Dave Chinner
2020-06-16 12:17       ` Bob Peterson
2020-06-16 13:23         ` Matthew Wilcox
2020-06-16 13:57           ` Andreas Gruenbacher
2020-06-16 16:25             ` Darrick J. Wong
2020-06-16 16:34               ` Andreas Grünbacher
2020-06-16 16:38               ` Bob Peterson
2020-06-17 23:44                 ` Dave Chinner
2020-06-18  1:39 ` Darrick J. Wong
2020-06-18 12:21   ` Andreas Gruenbacher
2020-06-18 12:32   ` Matthew Wilcox
2020-06-18 12:37     ` Andreas Gruenbacher
2020-06-18 13:56       ` Christoph Hellwig
2020-06-18 15:15         ` Matthew Wilcox
2020-06-19 13:18           ` Christoph Hellwig

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.