From: Goldwyn Rodrigues <rgoldwyn@suse.de>
To: linux-fsdevel@vger.kernel.org
Cc: jack@suse.com, hch@infradead.org, linux-block@vger.kernel.org,
linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-xfs@vger.kernel.org, sagi@grimberg.me, avi@scylladb.com,
axboe@kernel.dk, linux-api@vger.kernel.org, willy@infradead.org,
tom.leiming@gmail.com, Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: [PATCH 6/9] nowait aio: ext4
Date: Tue, 11 Apr 2017 09:26:16 -0500 [thread overview]
Message-ID: <20170411142619.27205-7-rgoldwyn@suse.de> (raw)
In-Reply-To: <20170411142619.27205-1-rgoldwyn@suse.de>
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
Return EAGAIN if any of the following checks fail for direct I/O:
+ i_rwsem is lockable
+ Writing beyond end of file (will trigger allocation)
+ Blocks are not allocated at the write location
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
fs/ext4/file.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index cefa9835f275..2efdc6d4d3e8 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -216,7 +216,13 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
return ext4_dax_write_iter(iocb, from);
#endif
- inode_lock(inode);
+ if (iocb->ki_flags & IOCB_NOWAIT) {
+ if (!inode_trylock(inode))
+ return -EAGAIN;
+ } else {
+ inode_lock(inode);
+ }
+
ret = ext4_write_checks(iocb, from);
if (ret <= 0)
goto out;
@@ -235,9 +241,15 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
iocb->private = &overwrite;
/* Check whether we do a DIO overwrite or not */
- if (o_direct && ext4_should_dioread_nolock(inode) && !unaligned_aio &&
- ext4_overwrite_io(inode, iocb->ki_pos, iov_iter_count(from)))
- overwrite = 1;
+ if (o_direct && !unaligned_aio) {
+ if (ext4_overwrite_io(inode, iocb->ki_pos, iov_iter_count(from))) {
+ if (ext4_should_dioread_nolock(inode))
+ overwrite = 1;
+ } else if (iocb->ki_flags & IOCB_NOWAIT) {
+ ret = -EAGAIN;
+ goto out;
+ }
+ }
ret = __generic_file_write_iter(iocb, from);
inode_unlock(inode);
--
2.12.0
next prev parent reply other threads:[~2017-04-11 14:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-11 14:26 [PATCH 0/9 v5] No wait AIO Goldwyn Rodrigues
2017-04-11 14:26 ` [PATCH 1/9] Use RWF_* flags for AIO operations Goldwyn Rodrigues
2017-04-12 8:33 ` Christoph Hellwig
2017-04-12 8:33 ` Christoph Hellwig
2017-04-11 14:26 ` [PATCH 2/9] nowait aio: Introduce RWF_NOWAIT Goldwyn Rodrigues
2017-04-11 14:26 ` [PATCH 3/9] nowait aio: return if direct write will trigger writeback Goldwyn Rodrigues
2017-04-11 14:26 ` [PATCH 4/9] nowait-aio: Introduce IOMAP_NOWAIT Goldwyn Rodrigues
2017-04-11 14:26 ` [PATCH 5/9] nowait aio: return on congested block device Goldwyn Rodrigues
2017-04-12 8:36 ` Christoph Hellwig
2017-04-12 18:31 ` Goldwyn Rodrigues
2017-04-11 14:26 ` Goldwyn Rodrigues [this message]
2017-04-11 14:26 ` [PATCH 7/9] nowait aio: xfs Goldwyn Rodrigues
2017-04-11 14:26 ` [PATCH 8/9] nowait aio: btrfs Goldwyn Rodrigues
2017-04-11 14:26 ` [PATCH 9/9] nowait aio: Return -EOPNOTSUPP if filesystem does not support Goldwyn Rodrigues
2017-04-12 8:37 ` 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=20170411142619.27205-7-rgoldwyn@suse.de \
--to=rgoldwyn@suse.de \
--cc=avi@scylladb.com \
--cc=axboe@kernel.dk \
--cc=hch@infradead.org \
--cc=jack@suse.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=rgoldwyn@suse.com \
--cc=sagi@grimberg.me \
--cc=tom.leiming@gmail.com \
--cc=willy@infradead.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 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.