Commit 41d36a9f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

fs: remove kiocb.ki_hint 



This field is entirely unused now except for a tracepoint in f2fs, so
remove it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220308060529.736277-2-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c75e707f

fs/aio.c

+0 −1
Original line number Diff line number Diff line
@@ -1478,7 +1478,6 @@ static int aio_prep_rw(struct kiocb *req, const struct iocb *iocb) 
	req->ki_flags = iocb_flags(req->ki_filp);

	if (iocb->aio_flags & IOCB_FLAG_RESFD)

		req->ki_flags |= IOCB_EVENTFD;

	req->ki_hint = ki_hint_validate(file_write_hint(req->ki_filp));

	if (iocb->aio_flags & IOCB_FLAG_IOPRIO) {

		/*

		 * If the IOCB_FLAG_IOPRIO flag of aio_flags is set, then

fs/cachefiles/io.c

+0 −2
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ static int cachefiles_read(struct netfs_cache_resources *cres, 
	ki->iocb.ki_filp	= file;

	ki->iocb.ki_pos		= start_pos + skipped;

	ki->iocb.ki_flags	= IOCB_DIRECT;

	ki->iocb.ki_hint	= ki_hint_validate(file_write_hint(file));

	ki->iocb.ki_ioprio	= get_current_ioprio();

	ki->skipped		= skipped;

	ki->object		= object;
@@ -313,7 +312,6 @@ static int cachefiles_write(struct netfs_cache_resources *cres, 
	ki->iocb.ki_filp	= file;

	ki->iocb.ki_pos		= start_pos;

	ki->iocb.ki_flags	= IOCB_DIRECT | IOCB_WRITE;

	ki->iocb.ki_hint	= ki_hint_validate(file_write_hint(file));

	ki->iocb.ki_ioprio	= get_current_ioprio();

	ki->object		= object;

	ki->inval_counter	= cres->inval_counter;

fs/f2fs/file.c

+0 −6
Original line number Diff line number Diff line
@@ -4479,10 +4479,8 @@ static ssize_t f2fs_dio_write_iter(struct kiocb *iocb, struct iov_iter *from, 
	struct f2fs_inode_info *fi = F2FS_I(inode);

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	const bool do_opu = f2fs_lfs_mode(sbi);

	const int whint_mode = F2FS_OPTION(sbi).whint_mode;

	const loff_t pos = iocb->ki_pos;

	const ssize_t count = iov_iter_count(from);

	const enum rw_hint hint = iocb->ki_hint;

	unsigned int dio_flags;

	struct iomap_dio *dio;

	ssize_t ret;
@@ -4515,8 +4513,6 @@ static ssize_t f2fs_dio_write_iter(struct kiocb *iocb, struct iov_iter *from, 
		if (do_opu)

			down_read(&fi->i_gc_rwsem[READ]);

	}

	if (whint_mode == WHINT_MODE_OFF)

		iocb->ki_hint = WRITE_LIFE_NOT_SET;



	/*

	 * We have to use __iomap_dio_rw() and iomap_dio_complete() instead of
@@ -4539,8 +4535,6 @@ static ssize_t f2fs_dio_write_iter(struct kiocb *iocb, struct iov_iter *from, 
		ret = iomap_dio_complete(dio);

	}



	if (whint_mode == WHINT_MODE_OFF)

		iocb->ki_hint = hint;

	if (do_opu)

		up_read(&fi->i_gc_rwsem[READ]);

	up_read(&fi->i_gc_rwsem[WRITE]);

fs/io_uring.c

+0 −1
Original line number Diff line number Diff line
@@ -3747,7 +3747,6 @@ static int io_write_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
{

	if (unlikely(!(req->file->f_mode & FMODE_WRITE)))

		return -EBADF;

	req->rw.kiocb.ki_hint = ki_hint_validate(file_write_hint(req->file));

	return io_prep_rw(req, sqe);

}

include/linux/fs.h

+0 −12
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ struct kiocb { 
	void (*ki_complete)(struct kiocb *iocb, long ret);

	void			*private;

	int			ki_flags;

	u16			ki_hint;

	u16			ki_ioprio; /* See linux/ioprio.h */

	struct wait_page_queue	*ki_waitq; /* for async buffered IO */

	randomized_struct_fields_end
@@ -2225,21 +2224,11 @@ static inline enum rw_hint file_write_hint(struct file *file) 


static inline int iocb_flags(struct file *file);



static inline u16 ki_hint_validate(enum rw_hint hint)

{

	typeof(((struct kiocb *)0)->ki_hint) max_hint = -1;



	if (hint <= max_hint)

		return hint;

	return 0;

}



static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp)

{

	*kiocb = (struct kiocb) {

		.ki_filp = filp,

		.ki_flags = iocb_flags(filp),

		.ki_hint = ki_hint_validate(file_write_hint(filp)),

		.ki_ioprio = get_current_ioprio(),

	};

}
@@ -2250,7 +2239,6 @@ static inline void kiocb_clone(struct kiocb *kiocb, struct kiocb *kiocb_src, 
	*kiocb = (struct kiocb) {

		.ki_filp = filp,

		.ki_flags = kiocb_src->ki_flags,

		.ki_hint = kiocb_src->ki_hint,

		.ki_ioprio = kiocb_src->ki_ioprio,

		.ki_pos = kiocb_src->ki_pos,

	};