Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdd2f5b7 authored by Goldwyn Rodrigues's avatar Goldwyn Rodrigues Committed by Jens Axboe
Browse files

fs: Separate out kiocb flags setup based on RWF_* flags 



Also added RWF_SUPPORTED to encompass all flags.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 443bd90f

fs/read_write.c

+3 −9
Original line number Diff line number Diff line
@@ -678,16 +678,10 @@ static ssize_t do_iter_readv_writev(struct file *filp, struct iov_iter *iter, 
	struct kiocb kiocb;

	ssize_t ret;



	if (flags & ~(RWF_HIPRI | RWF_DSYNC | RWF_SYNC))

		return -EOPNOTSUPP;



	init_sync_kiocb(&kiocb, filp);

	if (flags & RWF_HIPRI)

		kiocb.ki_flags |= IOCB_HIPRI;

	if (flags & RWF_DSYNC)

		kiocb.ki_flags |= IOCB_DSYNC;

	if (flags & RWF_SYNC)

		kiocb.ki_flags |= (IOCB_DSYNC | IOCB_SYNC);

	ret = kiocb_set_rw_flags(&kiocb, flags);

	if (ret)

		return ret;

	kiocb.ki_pos = *ppos;



	if (type == READ)

include/linux/fs.h

+14 −0
Original line number Diff line number Diff line
@@ -3057,6 +3057,20 @@ static inline int iocb_flags(struct file *file) 
	return res;

}



static inline int kiocb_set_rw_flags(struct kiocb *ki, int flags)

{

	if (unlikely(flags & ~RWF_SUPPORTED))

		return -EOPNOTSUPP;



	if (flags & RWF_HIPRI)

		ki->ki_flags |= IOCB_HIPRI;

	if (flags & RWF_DSYNC)

		ki->ki_flags |= IOCB_DSYNC;

	if (flags & RWF_SYNC)

		ki->ki_flags |= (IOCB_DSYNC | IOCB_SYNC);

	return 0;

}



static inline ino_t parent_ino(struct dentry *dentry)

{

	ino_t res;

include/uapi/linux/fs.h

+2 −0
Original line number Diff line number Diff line
@@ -361,4 +361,6 @@ struct fscrypt_key { 
#define RWF_DSYNC			0x00000002 /* per-IO O_DSYNC */

#define RWF_SYNC			0x00000004 /* per-IO O_SYNC */



#define RWF_SUPPORTED			(RWF_HIPRI | RWF_DSYNC | RWF_SYNC)



#endif /* _UAPI_LINUX_FS_H */