qiurui/Centos-kernel-stream-9
1
0
Fork 0
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git synced 2026-09-09 00:08:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fs: add a FMODE_ flag to indicate IOCB_HAS_METADATA availability

Browse Source 
JIRA: https://issues.redhat.com/browse/RHEL-105612
Conflicts: Upstream reworked the bit definitions.  I assigned the first
available bit to FMODE_HAS_METADATA (0x800000).

commit d072148a8631f102de60ed5a3a827e85d09d24f0
Author: Christoph Hellwig <hch@lst.de>
Date:   Tue Aug 19 10:25:00 2025 +0200

    fs: add a FMODE_ flag to indicate IOCB_HAS_METADATA availability
    
    Currently the kernel will happily route io_uring requests with metadata
    to file operations that don't support it.  Add a FMODE_ flag to guard
    that.
    
    Fixes: 4de2ce04c862 ("fs: introduce IOCB_HAS_METADATA for metadata")
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Link: https://lore.kernel.org/20250819082517.2038819-2-hch@lst.de
    Signed-off-by: Christian Brauner <brauner@kernel.org>

Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
This commit is contained in:
Jeff Moyer
2025-10-27 13:19:12 -04:00
parent 3534dd1862
commit 76632ef268
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
block/fops.c
+3
View File
@@ -7,6 +7,7 @@
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/blkdev.h>
#include <linux/blk-integrity.h>
#include <linux/buffer_head.h>
#include <linux/mpage.h>
#include <linux/uio.h>
@@ -656,6 +657,8 @@ static int blkdev_open(struct inode *inode, struct file *filp)
if (bdev_can_atomic_write(bdev))
filp->f_mode |= FMODE_CAN_ATOMIC_WRITE;
if (blk_get_integrity(bdev->bd_disk))
filp->f_mode |= FMODE_HAS_METADATA;
ret = bdev_open(bdev, mode, filp->private_data, NULL, filp);
if (ret)
include/linux/fs.h
+3
View File
@@ -164,6 +164,9 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
/* File supports DIRECT IO */
#define FMODE_CAN_ODIRECT ((__force fmode_t)0x400000)
/* Supports IOCB_HAS_METADATA */
#define FMODE_HAS_METADATA ((__force fmode_t)0x800000)
/* File was opened by fanotify and shouldn't generate fanotify events */
#define FMODE_NONOTIFY ((__force fmode_t)0x4000000)
io_uring/rw.c
+3
View File
@@ -840,6 +840,9 @@ static int io_rw_init_file(struct io_kiocb *req, fmode_t mode, int rw_type)
if (req->flags & REQ_F_HAS_METADATA) {
struct io_async_rw *io = req->async_data;
if (!(file->f_mode & FMODE_HAS_METADATA))
return -EINVAL;
/*
* We have a union of meta fields with wpq used for buffered-io
* in io_async_rw, so fail it here.