[Pvfs2-cvs] commit by slang in pvfs2/src/kernel/linux-2.6:
pvfs2-proc.c
CVS commit program
cvs at parl.clemson.edu
Thu Jan 7 15:13:03 EST 2010
Update of /projects/cvsroot/pvfs2/src/kernel/linux-2.6
In directory parlweb1:/tmp/cvs-serv18523/src/kernel/linux-2.6
Modified Files:
pvfs2-proc.c
Log Message:
fix #if checks for proc handlers.
Index: pvfs2-proc.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/kernel/linux-2.6/pvfs2-proc.c,v
diff -p -u -r1.14 -r1.15
--- pvfs2-proc.c 18 Dec 2009 22:52:23 -0000 1.14
+++ pvfs2-proc.c 7 Jan 2010 20:13:03 -0000 1.15
@@ -32,7 +32,7 @@ struct pvfs2_param_extra
* generic proc file handler for getting and setting various tunable
* pvfs2-client parameters
*/
-#ifdef HAVE_PROC_HANDLER_FILE_ARG
+#if defined(HAVE_PROC_HANDLER_FILE_ARG)
static int pvfs2_param_proc_handler(
ctl_table *ctl,
int write,
@@ -40,7 +40,7 @@ static int pvfs2_param_proc_handler(
void *buffer,
size_t *lenp,
loff_t *ppos)
-#elif HAVE_PROC_HANDLER_PPOS_ARG
+#elif defined(HAVE_PROC_HANDLER_PPOS_ARG)
static int pvfs2_param_proc_handler(
ctl_table *ctl,
int write,
@@ -77,9 +77,9 @@ static int pvfs2_param_proc_handler(
if(write)
{
/* use generic proc handling function to retrive value to set */
-#ifdef HAVE_PROC_HANDLER_FILE_ARG
+#if defined(HAVE_PROC_HANDLER_FILE_ARG)
ret = proc_dointvec_minmax(&tmp_ctl, write, filp, buffer, lenp, ppos);
-#elif HAVE_PROC_HANDLER_PPOS_ARG
+#elif defined(HAVE_PROC_HANDLER_PPOS_ARG)
ret = proc_dointvec_minmax(&tmp_ctl, write, buffer, lenp, ppos);
#else
ret = proc_dointvec_minmax(&tmp_ctl, write, filp, buffer, lenp);
@@ -110,9 +110,9 @@ static int pvfs2_param_proc_handler(
/* use generic proc handling function to output value */
val = (int)new_op->downcall.resp.param.value;
gossip_debug(GOSSIP_PROC_DEBUG, "pvfs2: proc read %d\n", val);
-#ifdef HAVE_PROC_HANDLER_FILE_ARG
+#if defined(HAVE_PROC_HANDLER_FILE_ARG)
ret = proc_dointvec_minmax(&tmp_ctl, write, filp, buffer, lenp, ppos);
-#elif HAVE_PROC_HANDLER_PPOS_ARG
+#elif defined(HAVE_PROC_HANDLER_PPOS_ARG)
ret = proc_dointvec_minmax(&tmp_ctl, write, buffer, lenp, ppos);
#else
ret = proc_dointvec_minmax(&tmp_ctl, write, filp, buffer, lenp);
@@ -123,7 +123,7 @@ static int pvfs2_param_proc_handler(
return(ret);
}
-#ifdef HAVE_PROC_HANDLER_FILE_ARG
+#if defined(HAVE_PROC_HANDLER_FILE_ARG)
static int pvfs2_pc_proc_handler(
ctl_table *ctl,
int write,
@@ -131,7 +131,7 @@ static int pvfs2_pc_proc_handler(
void *buffer,
size_t *lenp,
loff_t *ppos)
-#elif HAVE_PROC_HANDLER_PPOS_ARG
+#elif defined(HAVE_PROC_HANDLER_PPOS_ARG)
static int pvfs2_pc_proc_handler(
ctl_table *ctl,
int write,
More information about the Pvfs2-cvs
mailing list