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, axboe@kernel.dk,
linux-api@vger.kernel.org, adam.manzanares@wdc.com,
viro@zeniv.linux.org.uk, Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: [PATCH 10/10] btrfs: nowait aio support
Date: Wed, 24 May 2017 11:41:50 -0500 [thread overview]
Message-ID: <20170524164150.9492-11-rgoldwyn@suse.de> (raw)
In-Reply-To: <20170524164150.9492-1-rgoldwyn@suse.de>
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
Return EAGAIN if any of the following checks fail
+ i_rwsem is not lockable
+ NODATACOW or PREALLOC is not set
+ Cannot nocow at the desired location
+ Writing beyond end of file which is not allocated
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Acked-by: David Sterba <dsterba@suse.com>
---
fs/btrfs/file.c | 25 ++++++++++++++++++++-----
fs/btrfs/inode.c | 3 +++
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index da1096eb1a40..aae088e49915 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1875,12 +1875,29 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
ssize_t num_written = 0;
bool sync = (file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host);
ssize_t err;
- loff_t pos;
- size_t count;
+ loff_t pos = iocb->ki_pos;
+ size_t count = iov_iter_count(from);
loff_t oldsize;
int clean_page = 0;
- inode_lock(inode);
+ if ((iocb->ki_flags & IOCB_NOWAIT) &&
+ (iocb->ki_flags & IOCB_DIRECT)) {
+ /* Don't sleep on inode rwsem */
+ if (!inode_trylock(inode))
+ return -EAGAIN;
+ /*
+ * We will allocate space in case nodatacow is not set,
+ * so bail
+ */
+ if (!(BTRFS_I(inode)->flags & (BTRFS_INODE_NODATACOW |
+ BTRFS_INODE_PREALLOC)) ||
+ check_can_nocow(BTRFS_I(inode), pos, &count) <= 0) {
+ inode_unlock(inode);
+ return -EAGAIN;
+ }
+ } else
+ inode_lock(inode);
+
err = generic_write_checks(iocb, from);
if (err <= 0) {
inode_unlock(inode);
@@ -1914,8 +1931,6 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
*/
update_time_for_write(inode);
- pos = iocb->ki_pos;
- count = iov_iter_count(from);
start_pos = round_down(pos, fs_info->sectorsize);
oldsize = i_size_read(inode);
if (start_pos > oldsize) {
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 17cbe9306faf..2ab71b946829 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8755,6 +8755,9 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
dio_data.overwrite = 1;
inode_unlock(inode);
relock = true;
+ } else if (iocb->ki_flags & IOCB_NOWAIT) {
+ ret = -EAGAIN;
+ goto out;
}
ret = btrfs_delalloc_reserve_space(inode, offset, count);
if (ret)
--
2.12.0
next prev parent reply other threads:[~2017-05-24 16:41 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-24 16:41 [PATCH 0/10 v9] No wait AIO Goldwyn Rodrigues
2017-05-24 16:41 ` [PATCH 01/10] fs: Separate out kiocb flags setup based on RWF_* flags Goldwyn Rodrigues
2017-05-25 8:16 ` Jan Kara
2017-05-24 16:41 ` [PATCH 02/10] fs: Introduce filemap_range_has_page() Goldwyn Rodrigues
2017-05-25 8:25 ` Jan Kara
[not found] ` <20170524164150.9492-1-rgoldwyn-l3A5Bk7waGM@public.gmane.org>
2017-05-24 16:41 ` [PATCH 03/10] fs: Use RWF_* flags for AIO operations Goldwyn Rodrigues
2017-05-25 8:27 ` Jan Kara
2017-05-24 16:41 ` [PATCH 05/10] fs: return if direct write will trigger writeback Goldwyn Rodrigues
2017-05-25 8:32 ` Jan Kara
2017-05-28 9:27 ` [PATCH 0/10 v9] No wait AIO Christoph Hellwig
2017-05-29 2:38 ` Goldwyn Rodrigues
2017-05-29 8:32 ` Christoph Hellwig
2017-05-24 16:41 ` [PATCH 04/10] fs: Introduce RWF_NOWAIT Goldwyn Rodrigues
2017-05-25 8:30 ` Jan Kara
2017-05-24 16:41 ` [PATCH 06/10] fs: Introduce IOMAP_NOWAIT Goldwyn Rodrigues
2017-05-25 8:33 ` Jan Kara
2017-05-24 16:41 ` [PATCH 07/10] fs: return on congested block device Goldwyn Rodrigues
2017-05-24 16:41 ` [PATCH 08/10] ext4: nowait aio support Goldwyn Rodrigues
2017-05-24 16:41 ` [PATCH 09/10] xfs: " Goldwyn Rodrigues
2017-05-24 16:49 ` Darrick J. Wong
[not found] ` <20170524164150.9492-10-rgoldwyn-l3A5Bk7waGM@public.gmane.org>
2017-05-28 9:31 ` Christoph Hellwig
2017-05-29 2:38 ` Goldwyn Rodrigues
2017-05-29 8:21 ` Jan Kara
2017-05-29 8:33 ` Christoph Hellwig
[not found] ` <20170529083338.GC1899-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2017-05-30 16:13 ` Goldwyn Rodrigues
2017-05-31 8:51 ` Jan Kara
2017-05-24 16:41 ` Goldwyn Rodrigues [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-15 15:59 [PATCH 0/10 v12] No wait AIO Goldwyn Rodrigues
2017-06-15 16:00 ` [PATCH 10/10] btrfs: nowait aio support Goldwyn Rodrigues
2017-06-06 11:19 [PATCH 0/10 v11] No wait AIO Goldwyn Rodrigues
2017-06-06 11:19 ` [PATCH 10/10] btrfs: nowait aio support Goldwyn Rodrigues
2017-06-05 5:35 [PATCH 0/10 v10] No wait AIO Goldwyn Rodrigues
2017-06-05 5:35 ` [PATCH 10/10] btrfs: nowait aio support Goldwyn Rodrigues
2017-05-11 19:17 [PATCH 0/10 v8] No wait AIO Goldwyn Rodrigues
2017-05-11 19:17 ` [PATCH 10/10] btrfs: nowait aio support 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=20170524164150.9492-11-rgoldwyn@suse.de \
--to=rgoldwyn@suse.de \
--cc=adam.manzanares@wdc.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=viro@zeniv.linux.org.uk \
/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).