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/8] nowait aio: ext4 Date: Fri, 14 Apr 2017 07:02:55 -0500 [thread overview] Message-ID: <20170414120257.8932-7-rgoldwyn@suse.de> (raw) In-Reply-To: <20170414120257.8932-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-14 12:02 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-14 12:02 [PATCH 0/8 v6] No wait AIO Goldwyn Rodrigues [not found] ` <20170414120257.8932-1-rgoldwyn-l3A5Bk7waGM@public.gmane.org> 2017-04-14 12:02 ` [PATCH 1/8] Use RWF_* flags for AIO operations Goldwyn Rodrigues [not found] ` <20170414120257.8932-2-rgoldwyn-l3A5Bk7waGM@public.gmane.org> 2017-04-19 6:37 ` Christoph Hellwig 2017-04-14 12:02 ` [PATCH 2/8] nowait aio: Introduce RWF_NOWAIT Goldwyn Rodrigues 2017-04-19 6:39 ` Christoph Hellwig [not found] ` <20170419063930.GB20053-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> 2017-04-19 10:30 ` Goldwyn Rodrigues [not found] ` <2d816e3e-3625-7ebd-8550-68a7cc9c1a2e-l3A5Bk7waGM@public.gmane.org> 2017-04-19 11:03 ` Jan Kara 2017-04-14 12:02 ` [PATCH 3/8] nowait aio: return if direct write will trigger writeback Goldwyn Rodrigues 2017-04-14 12:02 ` [PATCH 4/8] nowait-aio: Introduce IOMAP_NOWAIT Goldwyn Rodrigues 2017-04-19 6:39 ` Christoph Hellwig [not found] ` <20170414120257.8932-5-rgoldwyn-l3A5Bk7waGM@public.gmane.org> 2017-04-19 7:12 ` Jan Kara 2017-04-14 12:02 ` [PATCH 5/8] nowait aio: return on congested block device Goldwyn Rodrigues 2017-04-19 6:45 ` Christoph Hellwig 2017-04-19 15:21 ` Goldwyn Rodrigues 2017-04-20 13:43 ` Jan Kara 2017-04-24 21:10 ` Goldwyn Rodrigues 2017-04-25 2:28 ` Jens Axboe 2017-04-14 12:02 ` Goldwyn Rodrigues [this message] 2017-04-14 12:02 ` [PATCH 7/8] nowait aio: xfs Goldwyn Rodrigues 2017-04-19 6:45 ` Christoph Hellwig 2017-04-14 12:02 ` [PATCH 8/8] nowait aio: btrfs Goldwyn Rodrigues [not found] ` <20170414120257.8932-9-rgoldwyn-l3A5Bk7waGM@public.gmane.org> 2017-04-18 11:39 ` David Sterba -- strict thread matches above, loose matches on Subject: below -- 2017-05-09 12:22 [PATCH 0/8 v7] No wait AIO Goldwyn Rodrigues 2017-05-09 12:22 ` [PATCH 6/8] nowait aio: ext4 Goldwyn Rodrigues [not found] ` <20170509122219.31756-7-rgoldwyn-l3A5Bk7waGM@public.gmane.org> 2017-05-09 14:57 ` Jan Kara 2017-04-03 18:52 [PATCH 0/8 v4] No wait AIO Goldwyn Rodrigues 2017-04-03 18:53 ` [PATCH 6/8] nowait aio: ext4 Goldwyn Rodrigues 2017-04-04 7:58 ` Jan Kara 2017-04-04 8:41 ` Christoph Hellwig 2017-04-04 18:41 ` Goldwyn Rodrigues 2017-04-10 7:45 ` Christoph Hellwig [not found] ` <20170410074539.GA18250-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> 2017-04-10 12:37 ` Jan Kara 2017-04-10 14:39 ` Christoph Hellwig 2017-04-10 15:13 ` Jan Kara 2017-03-15 21:50 [PATCH 0/8 v3] No wait AIO Goldwyn Rodrigues 2017-03-15 21:51 ` [PATCH 6/8] nowait aio: ext4 Goldwyn Rodrigues
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=20170414120257.8932-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 \ --subject='Re: [PATCH 6/8] nowait aio: ext4' \ /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
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).