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

Commit cb66a7a1 authored by Al Viro's avatar Al Viro
Browse files

kill generic_segment_checks() 



all callers of ->aio_read() and ->aio_write() have iov/nr_segs already
checked - generic_segment_checks() done after that is just an odd way
to spell iov_length().

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

drivers/staging/lustre/lustre/llite/file.c

+2 −8
Original line number Diff line number Diff line
@@ -1180,9 +1180,7 @@ static ssize_t ll_file_aio_read(struct kiocb *iocb, const struct iovec *iov, 
	ssize_t	     result;

	int		 refcheck;



	result = generic_segment_checks(iov, &nr_segs, &count, VERIFY_WRITE);

	if (result)

		return result;

	count = iov_length(iov, nr_segs);



	env = cl_env_get(&refcheck);

	if (IS_ERR(env))
@@ -1235,14 +1233,10 @@ static ssize_t ll_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 
{

	struct lu_env      *env;

	struct vvp_io_args *args;

	size_t	      count = 0;

	size_t	      count = iov_length(iov, nr_segs);

	ssize_t	     result;

	int		 refcheck;



	result = generic_segment_checks(iov, &nr_segs, &count, VERIFY_READ);

	if (result)

		return result;



	env = cl_env_get(&refcheck);

	if (IS_ERR(env))

		return PTR_ERR(env);

fs/btrfs/file.c

+1 −6
Original line number Diff line number Diff line
@@ -1726,12 +1726,7 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb, 


	mutex_lock(&inode->i_mutex);



	err = generic_segment_checks(iov, &nr_segs, &ocount, VERIFY_READ);

	if (err) {

		mutex_unlock(&inode->i_mutex);

		goto out;

	}

	count = ocount;

	count = ocount = iov_length(iov, nr_segs);



	current->backing_dev_info = inode->i_mapping->backing_dev_info;

	err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));

fs/ceph/file.c

+3 −10
Original line number Diff line number Diff line
@@ -828,12 +828,8 @@ again: 
		     inode, ceph_vinop(inode), iocb->ki_pos, (unsigned)len,

		     ceph_cap_string(got));



		if (!read) {

			ret = generic_segment_checks(iov, &nr_segs,

							&len, VERIFY_WRITE);

			if (ret)

				goto out;

		}

		if (!read)

			len = iov_length(iov, nr_segs);



		iov_iter_init(&i, iov, nr_segs, len, read);
@@ -855,7 +851,6 @@ again: 


		ret = generic_file_aio_read(iocb, iov, nr_segs, pos);

	}

out:

	dout("aio_read %p %llx.%llx dropping cap refs on %s = %d\n",

	     inode, ceph_vinop(inode), ceph_cap_string(got), (int)ret);

	ceph_put_cap_refs(ci, got);
@@ -911,9 +906,7 @@ static ssize_t ceph_aio_write(struct kiocb *iocb, const struct iovec *iov, 


	mutex_lock(&inode->i_mutex);



	err = generic_segment_checks(iov, &nr_segs, &count, VERIFY_READ);

	if (err)

		goto out;

	count = iov_length(iov, nr_segs);



	/* We can write back this queue in page reclaim */

	current->backing_dev_info = file->f_mapping->backing_dev_info;

fs/fuse/file.c

+1 −6
Original line number Diff line number Diff line
@@ -1208,12 +1208,7 @@ static ssize_t fuse_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 


	WARN_ON(iocb->ki_pos != pos);



	ocount = 0;

	err = generic_segment_checks(iov, &nr_segs, &ocount, VERIFY_READ);

	if (err)

		return err;



	count = ocount;

	count = ocount = iov_length(iov, nr_segs);

	mutex_lock(&inode->i_mutex);



	/* We can write back this queue in page reclaim */

fs/ntfs/file.c

+1 −4
Original line number Diff line number Diff line
@@ -2091,10 +2091,7 @@ static ssize_t ntfs_file_aio_write_nolock(struct kiocb *iocb, 
	size_t count;		/* after file limit checks */

	ssize_t written, err;



	count = 0;

	err = generic_segment_checks(iov, &nr_segs, &count, VERIFY_READ);

	if (err)

		return err;

	count = iov_length(iov, nr_segs);

	pos = *ppos;

	/* We can write back this queue in page reclaim. */

	current->backing_dev_info = mapping->backing_dev_info;