Commit 7dedd3e1 authored by Jens Axboe's avatar Jens Axboe
Browse files

Revert "iov_iter: track truncated size" 



This reverts commit 2112ff5c.

We no longer need to track the truncation count, the one user that did
need it has been converted to using iov_iter_restore() instead.

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

include/linux/uio.h

+1 −5
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ struct iov_iter { 
		};

		loff_t xarray_start;

	};

	size_t truncated;

};



static inline enum iter_type iov_iter_type(const struct iov_iter *i)
@@ -270,11 +269,9 @@ static inline void iov_iter_truncate(struct iov_iter *i, u64 count) 
	 * conversion in assignement is by definition greater than all

	 * values of size_t, including old i->count.

	 */

	if (i->count > count) {

		i->truncated += i->count - count;

	if (i->count > count)

		i->count = count;

}

}



/*

 * reexpand a previously truncated iterator; count must be no more than how much
@@ -282,7 +279,6 @@ static inline void iov_iter_truncate(struct iov_iter *i, u64 count) 
 */

static inline void iov_iter_reexpand(struct iov_iter *i, size_t count)

{

	i->truncated -= count - i->count;

	i->count = count;

}