| Message ID | 20220214174403.4147994-2-shr@fb.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Support sync buffered writes for io-uring | expand |
On Mon, Feb 14, 2022 at 09:43:50AM -0800, Stefan Roesch wrote: > This adds a flags parameter to the __begin_write_begin_int() function. > This allows to pass flags down the stack. In general, I am not in favour of more AOP_FLAG uses. I'd prefer to remove the two that we do have (reiserfs is the only user of AOP_FLAG_CONT_EXPAND and AOP_FLAG_NOFS can usually be replaced by passing in gfp_t flags).
I don't think that gfp flags are a great fit here. We only want to pass in a nowait flag and this does not map nicely to a gfp flag. Instead of passing in a flag parameter we can also pass in a bool parameter, however that has its limitations as it can't be extended in the future. On 2/14/22 11:02 AM, Matthew Wilcox wrote: > On Mon, Feb 14, 2022 at 09:43:50AM -0800, Stefan Roesch wrote: >> This adds a flags parameter to the __begin_write_begin_int() function. >> This allows to pass flags down the stack. > > In general, I am not in favour of more AOP_FLAG uses. I'd prefer to > remove the two that we do have (reiserfs is the only user of > AOP_FLAG_CONT_EXPAND and AOP_FLAG_NOFS can usually be replaced by > passing in gfp_t flags).
On Wed, Feb 16, 2022 at 10:31:18AM -0800, Stefan Roesch wrote: > I don't think that gfp flags are a great fit here. We only want to pass in > a nowait flag and this does not map nicely to a gfp flag. > > Instead of passing in a flag parameter we can also pass in a bool parameter, > however that has its limitations as it can't be extended in the future. if you're just going to copy and paste this inanity into every reply to me, let's just say hard NAK to every patch from you for now on?
diff --git a/fs/buffer.c b/fs/buffer.c index 8e112b6bd371..6e6a69a12eed 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -1970,7 +1970,8 @@ iomap_to_bh(struct inode *inode, sector_t block, struct buffer_head *bh, } int __block_write_begin_int(struct folio *folio, loff_t pos, unsigned len, - get_block_t *get_block, const struct iomap *iomap) + get_block_t *get_block, const struct iomap *iomap, + unsigned int flags) { unsigned from = pos & (PAGE_SIZE - 1); unsigned to = from + len; @@ -2058,7 +2059,7 @@ int __block_write_begin(struct page *page, loff_t pos, unsigned len, get_block_t *get_block) { return __block_write_begin_int(page_folio(page), pos, len, get_block, - NULL); + NULL, 0); } EXPORT_SYMBOL(__block_write_begin); @@ -2118,7 +2119,7 @@ int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len, if (!page) return -ENOMEM; - status = __block_write_begin(page, pos, len, get_block); + status = __block_write_begin_int(page_folio(page), pos, len, get_block, NULL, flags); if (unlikely(status)) { unlock_page(page); put_page(page); diff --git a/fs/internal.h b/fs/internal.h index 8590c973c2f4..7432df23f3ce 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -38,7 +38,8 @@ static inline int emergency_thaw_bdev(struct super_block *sb) * buffer.c */ int __block_write_begin_int(struct folio *folio, loff_t pos, unsigned len, - get_block_t *get_block, const struct iomap *iomap); + get_block_t *get_block, const struct iomap *iomap, + unsigned int flags); /* * char_dev.c diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 6c51a75d0be6..47c519952725 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -646,7 +646,7 @@ static int iomap_write_begin(const struct iomap_iter *iter, loff_t pos, if (srcmap->type == IOMAP_INLINE) status = iomap_write_begin_inline(iter, folio); else if (srcmap->flags & IOMAP_F_BUFFER_HEAD) - status = __block_write_begin_int(folio, pos, len, NULL, srcmap); + status = __block_write_begin_int(folio, pos, len, NULL, srcmap, 0); else status = __iomap_write_begin(iter, pos, len, folio); @@ -979,7 +979,7 @@ static loff_t iomap_folio_mkwrite_iter(struct iomap_iter *iter, if (iter->iomap.flags & IOMAP_F_BUFFER_HEAD) { ret = __block_write_begin_int(folio, iter->pos, length, NULL, - &iter->iomap); + &iter->iomap, 0); if (ret) return ret; block_commit_write(&folio->page, 0, length);
This adds a flags parameter to the __begin_write_begin_int() function. This allows to pass flags down the stack. Signed-off-by: Stefan Roesch <shr@fb.com> --- fs/buffer.c | 7 ++++--- fs/internal.h | 3 ++- fs/iomap/buffered-io.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-)