From 30f38472f75b5e9a9d55269bdb14da9c3cc45586 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 11 Jul 2014 23:05:14 -0700 Subject: [PATCH] staging: lustre: remove unneeded DECLARE_LL_PROC_PPOS_DECL macro It did nothing, so remove it. Cc: Andreas Dilger Cc: Oleg Drokin Cc: hpdd-discuss Signed-off-by: Greg Kroah-Hartman --- .../staging/lustre/include/linux/libcfs/linux/linux-prim.h | 2 -- .../lustre/include/linux/libcfs/linux/portals_compat25.h | 1 - drivers/staging/lustre/lnet/lnet/router_proc.c | 6 ------ drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c | 6 ------ 4 files changed, 15 deletions(-) diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h index b24bc6b18839..1069c33433e9 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h @@ -71,8 +71,6 @@ typedef struct ctl_table_header ctl_table_header_t; static int \ LL_PROC_PROTO(name) \ { \ - DECLARE_LL_PROC_PPOS_DECL; \ - \ return proc_call_handler(table->data, write, \ ppos, buffer, lenp, \ __##name); \ diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h b/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h index c6fa7ca4c87b..eae12a6baed0 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h @@ -88,7 +88,6 @@ #define LL_PROC_PROTO(name) \ name(ctl_table_t *table, int write, \ void __user *buffer, size_t *lenp, loff_t *ppos) -#define DECLARE_LL_PROC_PPOS_DECL /* helper for sysctl handlers */ int proc_call_handler(void *data, int write, diff --git a/drivers/staging/lustre/lnet/lnet/router_proc.c b/drivers/staging/lustre/lnet/lnet/router_proc.c index 414a9919b9b1..640cdc45975e 100644 --- a/drivers/staging/lustre/lnet/lnet/router_proc.c +++ b/drivers/staging/lustre/lnet/lnet/router_proc.c @@ -151,8 +151,6 @@ int LL_PROC_PROTO(proc_lnet_routes) int ver; int off; - DECLARE_LL_PROC_PPOS_DECL; - CLASSERT(sizeof(loff_t) >= 4); off = LNET_PROC_HOFF_GET(*ppos); @@ -278,8 +276,6 @@ int LL_PROC_PROTO(proc_lnet_routers) int ver; int off; - DECLARE_LL_PROC_PPOS_DECL; - off = LNET_PROC_HOFF_GET(*ppos); ver = LNET_PROC_VER_GET(*ppos); @@ -638,8 +634,6 @@ int LL_PROC_PROTO(proc_lnet_nis) char *s; int len; - DECLARE_LL_PROC_PPOS_DECL; - LASSERT(!write); if (*lenp == 0) diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c index 7bad930edbcf..70efd6b1b6e9 100644 --- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c +++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c @@ -93,7 +93,6 @@ int LL_PROC_PROTO(proc_memory_alloc) { char buf[22]; int len; - DECLARE_LL_PROC_PPOS_DECL; if (!*lenp || (*ppos && !write)) { *lenp = 0; @@ -117,7 +116,6 @@ int LL_PROC_PROTO(proc_pages_alloc) { char buf[22]; int len; - DECLARE_LL_PROC_PPOS_DECL; if (!*lenp || (*ppos && !write)) { *lenp = 0; @@ -141,7 +139,6 @@ int LL_PROC_PROTO(proc_mem_max) { char buf[22]; int len; - DECLARE_LL_PROC_PPOS_DECL; if (!*lenp || (*ppos && !write)) { *lenp = 0; @@ -165,7 +162,6 @@ int LL_PROC_PROTO(proc_pages_max) { char buf[22]; int len; - DECLARE_LL_PROC_PPOS_DECL; if (!*lenp || (*ppos && !write)) { *lenp = 0; @@ -188,7 +184,6 @@ int LL_PROC_PROTO(proc_pages_max) int LL_PROC_PROTO(proc_max_dirty_pages_in_mb) { int rc = 0; - DECLARE_LL_PROC_PPOS_DECL; if (!table->data || !table->maxlen || !*lenp || (*ppos && !write)) { *lenp = 0; @@ -230,7 +225,6 @@ int LL_PROC_PROTO(proc_max_dirty_pages_in_mb) int LL_PROC_PROTO(proc_alloc_fail_rate) { int rc = 0; - DECLARE_LL_PROC_PPOS_DECL; if (!table->data || !table->maxlen || !*lenp || (*ppos && !write)) { *lenp = 0; -- 2.39.5