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

Commit 2ba48ce5 authored by Al Viro's avatar Al Viro
Browse files

mirror O_APPEND and O_DIRECT into iocb->ki_flags 



... avoiding write_iter/fcntl races.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3309dd04

fs/aio.c

+1 −1
Original line number Diff line number Diff line
@@ -1502,7 +1502,7 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, 
	}

	req->common.ki_pos = iocb->aio_offset;

	req->common.ki_complete = aio_complete;

	req->common.ki_flags = 0;

	req->common.ki_flags = iocb_flags(req->common.ki_filp);



	if (iocb->aio_flags & IOCB_FLAG_RESFD) {

		/*

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1794,7 +1794,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, 
	if (sync)

		atomic_inc(&BTRFS_I(inode)->sync_writers);



	if (file->f_flags & O_DIRECT) {

	if (iocb->ki_flags & IOCB_DIRECT) {

		num_written = __btrfs_direct_write(iocb, from, pos);

	} else {

		num_written = __btrfs_buffered_write(file, from, pos);

fs/ceph/file.c

+4 −4
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *i, 
	if (ret < 0)

		return ret;



	if (file->f_flags & O_DIRECT) {

	if (iocb->ki_flags & IOCB_DIRECT) {

		while (iov_iter_count(i)) {

			size_t start;

			ssize_t n;
@@ -828,7 +828,7 @@ static ssize_t ceph_read_iter(struct kiocb *iocb, struct iov_iter *to) 
		return ret;



	if ((got & (CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO)) == 0 ||

	    (iocb->ki_filp->f_flags & O_DIRECT) ||

	    (iocb->ki_flags & IOCB_DIRECT) ||

	    (fi->flags & CEPH_F_SYNC)) {



		dout("aio_sync_read %p %llx.%llx %llu~%u got cap refs on %s\n",
@@ -995,12 +995,12 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	     inode, ceph_vinop(inode), pos, count, ceph_cap_string(got));



	if ((got & (CEPH_CAP_FILE_BUFFER|CEPH_CAP_FILE_LAZYIO)) == 0 ||

	    (file->f_flags & O_DIRECT) || (fi->flags & CEPH_F_SYNC)) {

	    (iocb->ki_flags & IOCB_DIRECT) || (fi->flags & CEPH_F_SYNC)) {

		struct iov_iter data;

		mutex_unlock(&inode->i_mutex);

		/* we might need to revert back to that point */

		data = *from;

		if (file->f_flags & O_DIRECT)

		if (iocb->ki_flags & IOCB_DIRECT)

			written = ceph_sync_direct_write(iocb, &data, pos);

		else

			written = ceph_sync_write(iocb, &data, pos);

fs/ext4/file.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	struct inode *inode = file_inode(iocb->ki_filp);

	struct mutex *aio_mutex = NULL;

	struct blk_plug plug;

	int o_direct = io_is_direct(file);

	int o_direct = iocb->ki_flags & IOCB_DIRECT;

	int overwrite = 0;

	ssize_t ret;
@@ -106,7 +106,7 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	if (o_direct &&

	    ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS) &&

	    !is_sync_kiocb(iocb) &&

	    (file->f_flags & O_APPEND ||

	    (iocb->ki_flags & IOCB_APPEND ||

	     ext4_unaligned_aio(inode, from, iocb->ki_pos))) {

		aio_mutex = ext4_aio_mutex(inode);

		mutex_lock(aio_mutex);

fs/fuse/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1177,7 +1177,7 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	if (err)

		goto out;



	if (file->f_flags & O_DIRECT) {

	if (iocb->ki_flags & IOCB_DIRECT) {

		loff_t pos = iocb->ki_pos;

		written = generic_file_direct_write(iocb, from, pos);

		if (written < 0 || !iov_iter_count(from))