[PATCH 1/1] rpdfs: Allow disabling rpdfs_prd() and friends

Fix the no-op versions and clean up some warnings about objects that
are only used when rpdfs_prd() is active.

Signed-off-by: Chris Kirby <[email protected]>
---
 fs/rpdfs/aops.c  |  5 ++---
 fs/rpdfs/inode.c |  9 +--------
 fs/rpdfs/pr.h    | 14 +++++++++++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/fs/rpdfs/aops.c b/fs/rpdfs/aops.c
index 08a6ecf4c77b..5d528b6eb0ab 100644
--- a/fs/rpdfs/aops.c
+++ b/fs/rpdfs/aops.c
@@ -37,7 +37,6 @@ void rpdfs_block_key_init(struct rpdfs_block_key *key, struct rpdfs_inode_nr *in
 static struct folio *get_block_key_folio(struct rpdfs_fs_info *rfi, struct rpdfs_block_key *key)
 {
 	struct super_block *sb = rfi->sb;
-	struct inode *mapping = NULL;
 	struct rpdfs_iget_data igd;
 	struct inode *inode;
 	struct folio *folio;
@@ -58,8 +57,8 @@ static struct folio *get_block_key_folio(struct rpdfs_fs_info *rfi, struct rpdfs
 		folio = ERR_PTR(-ENOENT);
 	rcu_read_unlock();
 
-	rpdfs_prd("key "RBKF" mapping %p folio %p index %ld",
-		  RBKA(key), mapping, folio, !IS_ERR(folio) ? folio->index : -1L);
+	rpdfs_prd("key "RBKF" inode %p folio %p index %ld",
+		  RBKA(key), inode, folio, !IS_ERR(folio) ? folio->index : -1L);
 out:
 	return folio;
 }
diff --git a/fs/rpdfs/inode.c b/fs/rpdfs/inode.c
index 39682eeeda21..8c6b9b5a7e6b 100644
--- a/fs/rpdfs/inode.c
+++ b/fs/rpdfs/inode.c
@@ -84,9 +84,7 @@ void rpdfs_free_inode(struct inode *inode)
 
 void rpdfs_evict_inode(struct inode *inode)
 {
-	struct rpdfs_inode_info *ri = RPDFS_I(inode);
-
-	rpdfs_prd("inode %p ri %p", inode, ri);
+	rpdfs_prd("inode %p ri %p", inode, RPDFS_I(inode));
 
 	rpdfs_meta_evict_shadow(inode);
 
@@ -177,11 +175,6 @@ void rpdfs_inode_init_ops(struct inode *inode)
 	}
 }
 
-static u64 ts64_to_ns(struct timespec64 ts)
-{
-	return timespec64_to_ns(&ts);
-}
-
 /*
  * Make sure that the inode is in sync with the most recent persistent
  * version in its inode block.  Typically this is a cheap test of the
diff --git a/fs/rpdfs/pr.h b/fs/rpdfs/pr.h
index ae276442ce78..2eea59b1a788 100644
--- a/fs/rpdfs/pr.h
+++ b/fs/rpdfs/pr.h
@@ -38,10 +38,18 @@ do { \
 	_rpdfs_pr_debug("[sb %s] " fmt, (sb)->s_id, ##args)
 #define rpdfs_prd_rfi(rfi, fmt, args...) \
 	_rpdfs_pr_debug(fmt, ##args)
+
+static inline u64 ts64_to_ns(struct timespec64 ts)
+{
+	return timespec64_to_ns(&ts);
+}
+
 #else
-#define rpdfs_prd(ctx, fmt, args...)
-do {
-	(void) ({ args## ; });
+#define rpdfs_prd(fmt, args...) \
+do { \
+} while (0)
+#define rpdfs_prd_rfi(rfi, fmt, args...) \
+do { \
 } while (0)
 #endif
 
-- 
2.55.0