Unverified Commit a9d47a50 authored by David Howells's avatar David Howells Committed by Christian Brauner
Browse files

netfs: Revert "netfs: Switch debug logging to pr_debug()" 



Revert commit 163eae0f to get back the
original operation of the debugging macros.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/20240608151352.22860-2-ukleinek@kernel.org
Link: https://lore.kernel.org/r/1410685.1721333252@warthog.procyon.org.uk


cc: Uwe Kleine-König <ukleinek@kernel.org>
cc: Christian Brauner <brauner@kernel.org>
cc: Jeff Layton <jlayton@kernel.org>
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 93306970

fs/netfs/buffered_read.c

+7 −7
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void netfs_rreq_unlock_folios(struct netfs_io_request *rreq) 
		if (!test_bit(NETFS_RREQ_DONT_UNLOCK_FOLIOS, &rreq->flags)) {

			if (folio->index == rreq->no_unlock_folio &&

			    test_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &rreq->flags))

				kdebug("no unlock");

				_debug("no unlock");

			else

				folio_unlock(folio);

		}
@@ -204,7 +204,7 @@ void netfs_readahead(struct readahead_control *ractl) 
	struct netfs_inode *ctx = netfs_inode(ractl->mapping->host);

	int ret;



	kenter("%lx,%x", readahead_index(ractl), readahead_count(ractl));

	_enter("%lx,%x", readahead_index(ractl), readahead_count(ractl));



	if (readahead_count(ractl) == 0)

		return;
@@ -268,7 +268,7 @@ int netfs_read_folio(struct file *file, struct folio *folio) 
	struct folio *sink = NULL;

	int ret;



	kenter("%lx", folio->index);

	_enter("%lx", folio->index);



	rreq = netfs_alloc_request(mapping, file,

				   folio_pos(folio), folio_size(folio),
@@ -508,7 +508,7 @@ int netfs_write_begin(struct netfs_inode *ctx, 


have_folio:

	*_folio = folio;

	kleave(" = 0");

	_leave(" = 0");

	return 0;



error_put:
@@ -518,7 +518,7 @@ int netfs_write_begin(struct netfs_inode *ctx, 
		folio_unlock(folio);

		folio_put(folio);

	}

	kleave(" = %d", ret);

	_leave(" = %d", ret);

	return ret;

}

EXPORT_SYMBOL(netfs_write_begin);
@@ -536,7 +536,7 @@ int netfs_prefetch_for_write(struct file *file, struct folio *folio, 
	size_t flen = folio_size(folio);

	int ret;



	kenter("%zx @%llx", flen, start);

	_enter("%zx @%llx", flen, start);



	ret = -ENOMEM;
@@ -567,7 +567,7 @@ int netfs_prefetch_for_write(struct file *file, struct folio *folio, 
error_put:

	netfs_put_request(rreq, false, netfs_rreq_trace_put_discard);

error:

	kleave(" = %d", ret);

	_leave(" = %d", ret);

	return ret;

}

fs/netfs/buffered_write.c

+6 −6
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static enum netfs_how_to_modify netfs_how_to_modify(struct netfs_inode *ctx, 
	struct netfs_group *group = netfs_folio_group(folio);

	loff_t pos = folio_pos(folio);



	kenter("");

	_enter("");



	if (group != netfs_group && group != NETFS_FOLIO_COPY_TO_CACHE)

		return NETFS_FLUSH_CONTENT;
@@ -272,12 +272,12 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter, 
		 */

		howto = netfs_how_to_modify(ctx, file, folio, netfs_group,

					    flen, offset, part, maybe_trouble);

		kdebug("howto %u", howto);

		_debug("howto %u", howto);

		switch (howto) {

		case NETFS_JUST_PREFETCH:

			ret = netfs_prefetch_for_write(file, folio, offset, part);

			if (ret < 0) {

				kdebug("prefetch = %zd", ret);

				_debug("prefetch = %zd", ret);

				goto error_folio_unlock;

			}

			break;
@@ -418,7 +418,7 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter, 
	}



	iocb->ki_pos += written;

	kleave(" = %zd [%zd]", written, ret);

	_leave(" = %zd [%zd]", written, ret);

	return written ? written : ret;



error_folio_unlock:
@@ -491,7 +491,7 @@ ssize_t netfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	struct netfs_inode *ictx = netfs_inode(inode);

	ssize_t ret;



	kenter("%llx,%zx,%llx", iocb->ki_pos, iov_iter_count(from), i_size_read(inode));

	_enter("%llx,%zx,%llx", iocb->ki_pos, iov_iter_count(from), i_size_read(inode));



	if (!iov_iter_count(from))

		return 0;
@@ -529,7 +529,7 @@ vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_gr 
	vm_fault_t ret = VM_FAULT_RETRY;

	int err;



	kenter("%lx", folio->index);

	_enter("%lx", folio->index);



	sb_start_pagefault(inode->i_sb);

fs/netfs/direct_read.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ ssize_t netfs_unbuffered_read_iter_locked(struct kiocb *iocb, struct iov_iter *i 
	size_t orig_count = iov_iter_count(iter);

	bool async = !is_sync_kiocb(iocb);



	kenter("");

	_enter("");



	if (!orig_count)

		return 0; /* Don't update atime */

fs/netfs/direct_write.c

+4 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter * 
	size_t len = iov_iter_count(iter);

	bool async = !is_sync_kiocb(iocb);



	kenter("");

	_enter("");



	/* We're going to need a bounce buffer if what we transmit is going to

	 * be different in some way to the source buffer, e.g. because it gets
@@ -45,7 +45,7 @@ ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter * 
	 */

	// TODO



	kdebug("uw %llx-%llx", start, end);

	_debug("uw %llx-%llx", start, end);



	wreq = netfs_create_write_req(iocb->ki_filp->f_mapping, iocb->ki_filp, start,

				      iocb->ki_flags & IOCB_DIRECT ?
@@ -96,7 +96,7 @@ ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter * 
	wreq->cleanup = netfs_cleanup_dio_write;

	ret = netfs_unbuffered_write(wreq, is_sync_kiocb(iocb), wreq->len);

	if (ret < 0) {

		kdebug("begin = %zd", ret);

		_debug("begin = %zd", ret);

		goto out;

	}
@@ -143,7 +143,7 @@ ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	loff_t pos = iocb->ki_pos;

	unsigned long long end = pos + iov_iter_count(from) - 1;



	kenter("%llx,%zx,%llx", pos, iov_iter_count(from), i_size_read(inode));

	_enter("%llx,%zx,%llx", pos, iov_iter_count(from), i_size_read(inode));



	if (!iov_iter_count(from))

		return 0;

fs/netfs/fscache_cache.c

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ int fscache_add_cache(struct fscache_cache *cache, 
{

	int n_accesses;



	kenter("{%s,%s}", ops->name, cache->name);

	_enter("{%s,%s}", ops->name, cache->name);



	BUG_ON(fscache_cache_state(cache) != FSCACHE_CACHE_IS_PREPARING);
@@ -257,7 +257,7 @@ int fscache_add_cache(struct fscache_cache *cache, 


	up_write(&fscache_addremove_sem);

	pr_notice("Cache \"%s\" added (type %s)\n", cache->name, ops->name);

	kleave(" = 0 [%s]", cache->name);

	_leave(" = 0 [%s]", cache->name);

	return 0;

}

EXPORT_SYMBOL(fscache_add_cache);