iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sunrpc & nfs: Add and use dprintk_cont macros

Browse Source 
Allow line continuations to work properly with KERN_CONT.

Signed-off-by: Joe Perches <joe@perches.com>
[Anna: Add fallback dprintk_cont() for when CONFIG_SUNRPC_DEBUG=n]
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Joe Perches 2016-10-15 13:59:03 -07:00 committed by Anna Schumaker
parent 566cf877a1
commit ddeaa6379d
2 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfs/write.c
View File

@ -1787,7 +1787,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)
if (status < 0) { if (status < 0) {
nfs_context_set_write_error(req->wb_context, status); nfs_context_set_write_error(req->wb_context, status);
nfs_inode_remove_request(req); nfs_inode_remove_request(req);
dprintk(", error = %d\n", status); dprintk_cont(", error = %d\n", status);
goto next; goto next;
} }
@ -1796,11 +1796,11 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)
if (!nfs_write_verifier_cmp(&req->wb_verf, &data->verf.verifier)) { if (!nfs_write_verifier_cmp(&req->wb_verf, &data->verf.verifier)) {
/* We have a match */ /* We have a match */
nfs_inode_remove_request(req); nfs_inode_remove_request(req);
dprintk(" OK\n"); dprintk_cont(" OK\n");
goto next; goto next;
} }
/* We have a mismatch. Write the page again */ /* We have a mismatch. Write the page again */
dprintk(" mismatch\n"); dprintk_cont(" mismatch\n");
nfs_mark_request_dirty(req); nfs_mark_request_dirty(req);
set_bit(NFS_CONTEXT_RESEND_WRITES, &req->wb_context->flags); set_bit(NFS_CONTEXT_RESEND_WRITES, &req->wb_context->flags);
next: next:

38
include/linux/sunrpc/debug.h
View File

@ -20,24 +20,45 @@ extern unsigned int nfsd_debug;
extern unsigned int nlm_debug; extern unsigned int nlm_debug;
#endif #endif
#define dprintk(args...) dfprintk(FACILITY, ## args) #define dprintk(fmt, ...) \
#define dprintk_rcu(args...) dfprintk_rcu(FACILITY, ## args) 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 #undef ifdebug
#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define ifdebug(fac) if (unlikely(rpc_debug & RPCDBG_##fac)) # define ifdebug(fac) if (unlikely(rpc_debug & RPCDBG_##fac))
# define dfprintk(fac, args...) \ # define dfprintk(fac, fmt, ...) \
do { \ do { \
ifdebug(fac) \ ifdebug(fac) \
printk(KERN_DEFAULT args); \ printk(KERN_DEFAULT fmt, ##__VA_ARGS__); \
} while (0) } while (0)
# define dfprintk_rcu(fac, args...) \ # define dfprintk_cont(fac, fmt, ...) \
do { \
ifdebug(fac) \
printk(KERN_CONT fmt, ##__VA_ARGS__); \
} while (0)
# define dfprintk_rcu(fac, fmt, ...) \
do { \ do { \
ifdebug(fac) { \ ifdebug(fac) { \
rcu_read_lock(); \ rcu_read_lock(); \
printk(KERN_DEFAULT args); \ printk(KERN_DEFAULT fmt, ##__VA_ARGS__); \
rcu_read_unlock(); \
} \
} while (0)
# define dfprintk_rcu_cont(fac, fmt, ...) \
do { \
ifdebug(fac) { \
rcu_read_lock(); \
printk(KERN_CONT fmt, ##__VA_ARGS__); \
rcu_read_unlock(); \ rcu_read_unlock(); \
} \ } \
} while (0) } while (0)
@ -45,8 +66,9 @@ extern unsigned int nlm_debug;
# define RPC_IFDEBUG(x) x # define RPC_IFDEBUG(x) x
#else #else
# define ifdebug(fac) if (0) # define ifdebug(fac) if (0)
# define dfprintk(fac, args...) do {} while (0) # define dfprintk(fac, fmt, ...) do {} while (0)
# define dfprintk_rcu(fac, args...) do {} while (0) # define dfprintk_cont(fac, fmt, ...) do {} while (0)
# define dfprintk_rcu(fac, fmt, ...) do {} while (0)
# define RPC_IFDEBUG(x) # define RPC_IFDEBUG(x)
#endif #endif