Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5900ba93 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: rename proc_call_handler to lprocfs_call_handler



Using proc_call_handler as a function name is way too generic.
Rename to lprocfs_call_handler to avoid possible collisions.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 31b36ec6
Loading
Loading
Loading
Loading
+9 −9
Original line number Original line Diff line number Diff line
@@ -217,7 +217,7 @@ struct cfs_psdev_ops libcfs_psdev_ops = {
	libcfs_ioctl
	libcfs_ioctl
};
};


static int proc_call_handler(void *data, int write, loff_t *ppos,
static int lprocfs_call_handler(void *data, int write, loff_t *ppos,
			     void __user *buffer, size_t *lenp,
			     void __user *buffer, size_t *lenp,
			     int (*handler)(void *data, int write, loff_t pos,
			     int (*handler)(void *data, int write, loff_t pos,
					    void __user *buffer, int len))
					    void __user *buffer, int len))
@@ -280,7 +280,7 @@ static int __proc_dobitmasks(void *data, int write,
static int proc_dobitmasks(struct ctl_table *table, int write,
static int proc_dobitmasks(struct ctl_table *table, int write,
			   void __user *buffer, size_t *lenp, loff_t *ppos)
			   void __user *buffer, size_t *lenp, loff_t *ppos)
{
{
	return proc_call_handler(table->data, write, ppos, buffer, lenp,
	return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
				    __proc_dobitmasks);
				    __proc_dobitmasks);
}
}


@@ -296,7 +296,7 @@ static int __proc_dump_kernel(void *data, int write,
static int proc_dump_kernel(struct ctl_table *table, int write,
static int proc_dump_kernel(struct ctl_table *table, int write,
			    void __user *buffer, size_t *lenp, loff_t *ppos)
			    void __user *buffer, size_t *lenp, loff_t *ppos)
{
{
	return proc_call_handler(table->data, write, ppos, buffer, lenp,
	return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
				    __proc_dump_kernel);
				    __proc_dump_kernel);
}
}


@@ -319,7 +319,7 @@ static int __proc_daemon_file(void *data, int write,
static int proc_daemon_file(struct ctl_table *table, int write,
static int proc_daemon_file(struct ctl_table *table, int write,
			    void __user *buffer, size_t *lenp, loff_t *ppos)
			    void __user *buffer, size_t *lenp, loff_t *ppos)
{
{
	return proc_call_handler(table->data, write, ppos, buffer, lenp,
	return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
				    __proc_daemon_file);
				    __proc_daemon_file);
}
}


@@ -389,7 +389,7 @@ static int __proc_cpt_table(void *data, int write,
static int proc_cpt_table(struct ctl_table *table, int write,
static int proc_cpt_table(struct ctl_table *table, int write,
			  void __user *buffer, size_t *lenp, loff_t *ppos)
			  void __user *buffer, size_t *lenp, loff_t *ppos)
{
{
	return proc_call_handler(table->data, write, ppos, buffer, lenp,
	return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
				    __proc_cpt_table);
				    __proc_cpt_table);
}
}