Merge branch 'work.autofs' into for-linus

[karo-tx-linux.git] / net / rds / rds.h

diff --git a/net/rds/rds.h b/net/rds/rds.h
index b2d17f0fafa865f91aa42fc93625aa8ca69f891b..67ba67c058b1b6b8e02631d664c41cac4deaadcc 100644 (file)
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -33,7 +33,7 @@
 #define KERNEL_HAS_ATOMIC64
 #endif
 
-#ifdef DEBUG
+#ifdef RDS_DEBUG
 #define rdsdebug(fmt, args...) pr_debug("%s(): " fmt, __func__ , ##args)
 #else
 /* sigh, pr_debug() causes unused variable warnings */
@@ -688,6 +688,7 @@ void __rds_conn_error(struct rds_connection *conn, const char *, ...);
 #define rds_conn_error(conn, fmt...) \
        __rds_conn_error(conn, KERN_WARNING "RDS: " fmt)
 
+__printf(2, 3)
 void __rds_conn_path_error(struct rds_conn_path *cp, const char *, ...);
 #define rds_conn_path_error(cp, fmt...) \
        __rds_conn_path_error(cp, KERN_WARNING "RDS: " fmt)