Commit 9082aae1 authored by Jeff Layton's avatar Jeff Layton Committed by Anna Schumaker
Browse files

sunrpc: remove dfprintk_cont() and dfprintk_rcu_cont() 



KERN_CONT hails from a simpler time, when SMP wasn't the norm. These
days, it doesn't quite work right since another printk() can always race
in between the first one and the one being "continued".

Nothing calls dprintk_rcu_cont(), so just remove it. The only caller of
dprintk_cont() is in nfs_commit_release_pages(). Just use a normal
dprintk() there instead, since this is not SMP-safe anyway.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarAnna Schumaker <anna.schumaker@oracle.com>
parent 64dd8022

fs/nfs/write.c

+3 −3
Original line number Diff line number Diff line
@@ -1818,7 +1818,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data) 
				nfs_mapping_set_error(folio, status);

				nfs_inode_remove_request(req);

			}

			dprintk_cont(", error = %d\n", status);

			dprintk(", error = %d\n", status);

			goto next;

		}
@@ -1828,11 +1828,11 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data) 
			/* We have a match */

			if (folio)

				nfs_inode_remove_request(req);

			dprintk_cont(" OK\n");

			dprintk(" OK\n");

			goto next;

		}

		/* We have a mismatch. Write the page again */

		dprintk_cont(" mismatch\n");

		dprintk(" mismatch\n");

		nfs_mark_request_dirty(req);

		atomic_long_inc(&NFS_I(data->inode)->redirtied_pages);

	next:

include/linux/sunrpc/debug.h

+2 −22
Original line number Diff line number Diff line
@@ -23,12 +23,8 @@ extern unsigned int nlm_debug; 


#define dprintk(fmt, ...)						\

	dfprintk(FACILITY, fmt, ##__VA_ARGS__)

#define dprintk_cont(fmt, ...)						\

	dfprintk_cont(FACILITY, fmt, ##__VA_ARGS__)

#define dprintk_rcu(fmt, ...)						\

	dfprintk_rcu(FACILITY, fmt, ##__VA_ARGS__)

#define dprintk_rcu_cont(fmt, ...)					\

	dfprintk_rcu_cont(FACILITY, fmt, ##__VA_ARGS__)



#undef ifdebug

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
@@ -40,12 +36,6 @@ do { \ 
		printk(KERN_DEFAULT fmt, ##__VA_ARGS__);				\

} while (0)



# define dfprintk_cont(fac, fmt, ...)					\

do {									\

	ifdebug(fac)							\

		printk(KERN_CONT fmt, ##__VA_ARGS__);			\

} while (0)



# define dfprintk_rcu(fac, fmt, ...)					\

do {									\

	ifdebug(fac) {							\
@@ -55,20 +45,10 @@ do { \ 
	}								\

} while (0)



# define dfprintk_rcu_cont(fac, fmt, ...)				\

do {									\

	ifdebug(fac) {							\

		rcu_read_lock();					\

		printk(KERN_CONT fmt, ##__VA_ARGS__);			\

		rcu_read_unlock();					\

	}								\

} while (0)



# define RPC_IFDEBUG(x)		x

#else

# define ifdebug(fac)		if (0)

# define dfprintk(fac, fmt, ...)	do {} while (0)

# define dfprintk_cont(fac, fmt, ...)	do {} while (0)

# define dfprintk_rcu(fac, fmt, ...)	do {} while (0)

# define RPC_IFDEBUG(x)

#endif