Browse Source

x_tables: Convert printk to pr_err

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Joe Perches 16 năm trước cách đây
mục cha
commit
3dd5d7e3ba
1 tập tin đã thay đổi với 8 bổ sung8 xóa
  1. 8 8
      net/netfilter/x_tables.c

+ 8 - 8
net/netfilter/x_tables.c

@@ -364,14 +364,14 @@ int xt_check_match(struct xt_mtchk_param *par,
 		 * ebt_among is exempt from centralized matchsize checking
 		 * ebt_among is exempt from centralized matchsize checking
 		 * because it uses a dynamic-size data set.
 		 * because it uses a dynamic-size data set.
 		 */
 		 */
-		printk("%s_tables: %s match: invalid size %Zu != %u\n",
+		pr_err("%s_tables: %s match: invalid size %Zu != %u\n",
 		       xt_prefix[par->family], par->match->name,
 		       xt_prefix[par->family], par->match->name,
 		       XT_ALIGN(par->match->matchsize), size);
 		       XT_ALIGN(par->match->matchsize), size);
 		return -EINVAL;
 		return -EINVAL;
 	}
 	}
 	if (par->match->table != NULL &&
 	if (par->match->table != NULL &&
 	    strcmp(par->match->table, par->table) != 0) {
 	    strcmp(par->match->table, par->table) != 0) {
-		printk("%s_tables: %s match: only valid in %s table, not %s\n",
+		pr_err("%s_tables: %s match: only valid in %s table, not %s\n",
 		       xt_prefix[par->family], par->match->name,
 		       xt_prefix[par->family], par->match->name,
 		       par->match->table, par->table);
 		       par->match->table, par->table);
 		return -EINVAL;
 		return -EINVAL;
@@ -379,7 +379,7 @@ int xt_check_match(struct xt_mtchk_param *par,
 	if (par->match->hooks && (par->hook_mask & ~par->match->hooks) != 0) {
 	if (par->match->hooks && (par->hook_mask & ~par->match->hooks) != 0) {
 		char used[64], allow[64];
 		char used[64], allow[64];
 
 
-		printk("%s_tables: %s match: used from hooks %s, but only "
+		pr_err("%s_tables: %s match: used from hooks %s, but only "
 		       "valid from %s\n",
 		       "valid from %s\n",
 		       xt_prefix[par->family], par->match->name,
 		       xt_prefix[par->family], par->match->name,
 		       textify_hooks(used, sizeof(used), par->hook_mask),
 		       textify_hooks(used, sizeof(used), par->hook_mask),
@@ -387,7 +387,7 @@ int xt_check_match(struct xt_mtchk_param *par,
 		return -EINVAL;
 		return -EINVAL;
 	}
 	}
 	if (par->match->proto && (par->match->proto != proto || inv_proto)) {
 	if (par->match->proto && (par->match->proto != proto || inv_proto)) {
-		printk("%s_tables: %s match: only valid for protocol %u\n",
+		pr_err("%s_tables: %s match: only valid for protocol %u\n",
 		       xt_prefix[par->family], par->match->name,
 		       xt_prefix[par->family], par->match->name,
 		       par->match->proto);
 		       par->match->proto);
 		return -EINVAL;
 		return -EINVAL;
@@ -514,14 +514,14 @@ int xt_check_target(struct xt_tgchk_param *par,
 		    unsigned int size, u_int8_t proto, bool inv_proto)
 		    unsigned int size, u_int8_t proto, bool inv_proto)
 {
 {
 	if (XT_ALIGN(par->target->targetsize) != size) {
 	if (XT_ALIGN(par->target->targetsize) != size) {
-		printk("%s_tables: %s target: invalid size %Zu != %u\n",
+		pr_err("%s_tables: %s target: invalid size %Zu != %u\n",
 		       xt_prefix[par->family], par->target->name,
 		       xt_prefix[par->family], par->target->name,
 		       XT_ALIGN(par->target->targetsize), size);
 		       XT_ALIGN(par->target->targetsize), size);
 		return -EINVAL;
 		return -EINVAL;
 	}
 	}
 	if (par->target->table != NULL &&
 	if (par->target->table != NULL &&
 	    strcmp(par->target->table, par->table) != 0) {
 	    strcmp(par->target->table, par->table) != 0) {
-		printk("%s_tables: %s target: only valid in %s table, not %s\n",
+		pr_err("%s_tables: %s target: only valid in %s table, not %s\n",
 		       xt_prefix[par->family], par->target->name,
 		       xt_prefix[par->family], par->target->name,
 		       par->target->table, par->table);
 		       par->target->table, par->table);
 		return -EINVAL;
 		return -EINVAL;
@@ -529,7 +529,7 @@ int xt_check_target(struct xt_tgchk_param *par,
 	if (par->target->hooks && (par->hook_mask & ~par->target->hooks) != 0) {
 	if (par->target->hooks && (par->hook_mask & ~par->target->hooks) != 0) {
 		char used[64], allow[64];
 		char used[64], allow[64];
 
 
-		printk("%s_tables: %s target: used from hooks %s, but only "
+		pr_err("%s_tables: %s target: used from hooks %s, but only "
 		       "usable from %s\n",
 		       "usable from %s\n",
 		       xt_prefix[par->family], par->target->name,
 		       xt_prefix[par->family], par->target->name,
 		       textify_hooks(used, sizeof(used), par->hook_mask),
 		       textify_hooks(used, sizeof(used), par->hook_mask),
@@ -537,7 +537,7 @@ int xt_check_target(struct xt_tgchk_param *par,
 		return -EINVAL;
 		return -EINVAL;
 	}
 	}
 	if (par->target->proto && (par->target->proto != proto || inv_proto)) {
 	if (par->target->proto && (par->target->proto != proto || inv_proto)) {
-		printk("%s_tables: %s target: only valid for protocol %u\n",
+		pr_err("%s_tables: %s target: only valid for protocol %u\n",
 		       xt_prefix[par->family], par->target->name,
 		       xt_prefix[par->family], par->target->name,
 		       par->target->proto);
 		       par->target->proto);
 		return -EINVAL;
 		return -EINVAL;