Commit b475272f authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

iov_iter: remove iov_iter_is_aligned 



No more callers.

Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMike Snitzer <snitzer@kernel.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 69d7ed5b

include/linux/uio.h

+0 −2
Original line number Diff line number Diff line
@@ -286,8 +286,6 @@ size_t _copy_mc_to_iter(const void *addr, size_t bytes, struct iov_iter *i); 
#endif



size_t iov_iter_zero(size_t bytes, struct iov_iter *);

bool iov_iter_is_aligned(const struct iov_iter *i, unsigned addr_mask,

			unsigned len_mask);

unsigned long iov_iter_alignment(const struct iov_iter *i);

unsigned long iov_iter_gap_alignment(const struct iov_iter *i);

void iov_iter_init(struct iov_iter *i, unsigned int direction, const struct iovec *iov,

lib/iov_iter.c

+0 −95
Original line number Diff line number Diff line
@@ -784,101 +784,6 @@ void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t count) 
}

EXPORT_SYMBOL(iov_iter_discard);



static bool iov_iter_aligned_iovec(const struct iov_iter *i, unsigned addr_mask,

				   unsigned len_mask)

{

	const struct iovec *iov = iter_iov(i);

	size_t size = i->count;

	size_t skip = i->iov_offset;



	do {

		size_t len = iov->iov_len - skip;



		if (len > size)

			len = size;

		if (len & len_mask)

			return false;

		if ((unsigned long)(iov->iov_base + skip) & addr_mask)

			return false;



		iov++;

		size -= len;

		skip = 0;

	} while (size);



	return true;

}



static bool iov_iter_aligned_bvec(const struct iov_iter *i, unsigned addr_mask,

				  unsigned len_mask)

{

	const struct bio_vec *bvec = i->bvec;

	unsigned skip = i->iov_offset;

	size_t size = i->count;



	do {

		size_t len = bvec->bv_len - skip;



		if (len > size)

			len = size;

		if (len & len_mask)

			return false;

		if ((unsigned long)(bvec->bv_offset + skip) & addr_mask)

			return false;



		bvec++;

		size -= len;

		skip = 0;

	} while (size);



	return true;

}



/**

 * iov_iter_is_aligned() - Check if the addresses and lengths of each segments

 * 	are aligned to the parameters.

 *

 * @i: &struct iov_iter to restore

 * @addr_mask: bit mask to check against the iov element's addresses

 * @len_mask: bit mask to check against the iov element's lengths

 *

 * Return: false if any addresses or lengths intersect with the provided masks

 */

bool iov_iter_is_aligned(const struct iov_iter *i, unsigned addr_mask,

			 unsigned len_mask)

{

	if (likely(iter_is_ubuf(i))) {

		if (i->count & len_mask)

			return false;

		if ((unsigned long)(i->ubuf + i->iov_offset) & addr_mask)

			return false;

		return true;

	}



	if (likely(iter_is_iovec(i) || iov_iter_is_kvec(i)))

		return iov_iter_aligned_iovec(i, addr_mask, len_mask);



	if (iov_iter_is_bvec(i))

		return iov_iter_aligned_bvec(i, addr_mask, len_mask);



	/* With both xarray and folioq types, we're dealing with whole folios. */

	if (iov_iter_is_xarray(i)) {

		if (i->count & len_mask)

			return false;

		if ((i->xarray_start + i->iov_offset) & addr_mask)

			return false;

	}

	if (iov_iter_is_folioq(i)) {

		if (i->count & len_mask)

			return false;

		if (i->iov_offset & addr_mask)

			return false;

	}



	return true;

}

EXPORT_SYMBOL_GPL(iov_iter_is_aligned);



static unsigned long iov_iter_alignment_iovec(const struct iov_iter *i)

{

	const struct iovec *iov = iter_iov(i);