Commit 7ba167c4 authored by David Howells's avatar David Howells
Browse files

netfs: Switch to using unsigned long long rather than loff_t 



Switch to using unsigned long long rather than loff_t in netfslib to avoid
problems with the sign flipping in the maths when we're dealing with the
byte at position 0x7fffffffffffffff.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: netfs@lists.linux.dev
cc: ceph-devel@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
parent 5a550a0c

fs/cachefiles/io.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ cachefiles_do_prepare_read(struct netfs_cache_resources *cres, 
 * boundary as appropriate.

 */

static enum netfs_io_source cachefiles_prepare_read(struct netfs_io_subrequest *subreq,

						    loff_t i_size)

						    unsigned long long i_size)

{

	return cachefiles_do_prepare_read(&subreq->rreq->cache_resources,

					  subreq->start, &subreq->len, i_size,

fs/ceph/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static void ceph_netfs_expand_readahead(struct netfs_io_request *rreq) 
	 * block, but do not exceed the file size, unless the original

	 * request already exceeds it.

	 */

	new_end = min(round_up(end, lo->stripe_unit), rreq->i_size);

	new_end = umin(round_up(end, lo->stripe_unit), rreq->i_size);

	if (new_end > end && new_end <= rreq->start + max_len)

		rreq->len = new_end - rreq->start;

fs/netfs/buffered_read.c

+3 −1
Original line number Diff line number Diff line
@@ -130,7 +130,9 @@ void netfs_rreq_unlock_folios(struct netfs_io_request *rreq) 
}



static void netfs_cache_expand_readahead(struct netfs_io_request *rreq,

					 loff_t *_start, size_t *_len, loff_t i_size)

					 unsigned long long *_start,

					 unsigned long long *_len,

					 unsigned long long i_size)

{

	struct netfs_cache_resources *cres = &rreq->cache_resources;

fs/netfs/buffered_write.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static void netfs_pages_written_back(struct netfs_io_request *wreq) 
	last = (wreq->start + wreq->len - 1) / PAGE_SIZE;

	xas_for_each(&xas, folio, last) {

		WARN(!folio_test_writeback(folio),

		     "bad %zx @%llx page %lx %lx\n",

		     "bad %llx @%llx page %lx %lx\n",

		     wreq->len, wreq->start, folio->index, last);



		if ((finfo = netfs_folio_info(folio))) {

fs/netfs/io.c

+3 −3
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ netfs_rreq_prepare_read(struct netfs_io_request *rreq, 


set:

	if (subreq->len > rreq->len)

		pr_warn("R=%08x[%u] SREQ>RREQ %zx > %zx\n",

		pr_warn("R=%08x[%u] SREQ>RREQ %zx > %llx\n",

			rreq->debug_id, subreq->debug_index,

			subreq->len, rreq->len);
@@ -513,7 +513,7 @@ static bool netfs_rreq_submit_slice(struct netfs_io_request *rreq, 
	subreq->start		= rreq->start + rreq->submitted;

	subreq->len		= io_iter->count;



	_debug("slice %llx,%zx,%zx", subreq->start, subreq->len, rreq->submitted);

	_debug("slice %llx,%zx,%llx", subreq->start, subreq->len, rreq->submitted);

	list_add_tail(&subreq->rreq_link, &rreq->subrequests);



	/* Call out to the cache to find out what it can do with the remaining
@@ -588,7 +588,7 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync) 
	atomic_set(&rreq->nr_outstanding, 1);

	io_iter = rreq->io_iter;

	do {

		_debug("submit %llx + %zx >= %llx",

		_debug("submit %llx + %llx >= %llx",

		       rreq->start, rreq->submitted, rreq->i_size);

		if (rreq->origin == NETFS_DIO_READ &&

		    rreq->start + rreq->submitted >= rreq->i_size)