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

Commit 708a24c1 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: make LNet use lprocfs_call_handler 



Sometime ago a patch was submitted to duplicate the
proc_call_handler code in the LNet layer. This was
due to the thinking libcfs was not used by the LNet
layer. This was a wrong assumption so lets make LNet
use the lprocfs_call_handler from the libcfs layer.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5900ba93

drivers/staging/lustre/include/linux/libcfs/libcfs.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -154,5 +154,9 @@ struct lnet_debugfs_symlink_def { 




void lustre_insert_debugfs(struct ctl_table *table,

void lustre_insert_debugfs(struct ctl_table *table,

			   const struct lnet_debugfs_symlink_def *symlinks);

			   const struct lnet_debugfs_symlink_def *symlinks);

int lprocfs_call_handler(void *data, int write, loff_t *ppos,

			  void __user *buffer, size_t *lenp,

			  int (*handler)(void *data, int write,

			  loff_t pos, void __user *buffer, int len));





#endif /* _LIBCFS_H */
 
#endif /* _LIBCFS_H */

drivers/staging/lustre/lnet/lnet/router_proc.c

+6 −26
Original line number Original line Diff line number Diff line
@@ -73,26 +73,6 @@ 




#define LNET_PROC_VERSION(v)	((unsigned int)((v) & LNET_PROC_VER_MASK))

#define LNET_PROC_VERSION(v)	((unsigned int)((v) & LNET_PROC_VER_MASK))





static int proc_call_handler(void *data, int write, loff_t *ppos,

			     void __user *buffer, size_t *lenp,

			     int (*handler)(void *data, int write,

					    loff_t pos, void __user *buffer,

					    int len))

{

	int rc = handler(data, write, *ppos, buffer, *lenp);



	if (rc < 0)

		return rc;



	if (write) {

		*ppos += *lenp;

	} else {

		*lenp = rc;

		*ppos += rc;

	}

	return 0;

}



static int __proc_lnet_stats(void *data, int write,

static int __proc_lnet_stats(void *data, int write,

			     loff_t pos, void __user *buffer, int nob)

			     loff_t pos, void __user *buffer, int nob)

{

{
@@ -144,7 +124,7 @@ static int __proc_lnet_stats(void *data, int write, 
static int proc_lnet_stats(struct ctl_table *table, int write,

static int proc_lnet_stats(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_lnet_stats);

				    __proc_lnet_stats);

}

}
@@ -640,7 +620,7 @@ static int __proc_lnet_buffers(void *data, int write, 
static int proc_lnet_buffers(struct ctl_table *table, int write,

static int proc_lnet_buffers(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_lnet_buffers);

				    __proc_lnet_buffers);

}

}
@@ -865,7 +845,7 @@ static int proc_lnet_portal_rotor(struct ctl_table *table, int write, 
				  void __user *buffer, size_t *lenp,

				  void __user *buffer, size_t *lenp,

				  loff_t *ppos)

				  loff_t *ppos)

{

{

	return proc_call_handler(table->data, write, ppos, buffer, lenp,

	return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,

				    __proc_lnet_portal_rotor);

				    __proc_lnet_portal_rotor);

}

}

drivers/staging/lustre/lustre/libcfs/module.c

+5 −4
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 lprocfs_call_handler(void *data, int write, loff_t *ppos,

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))
@@ -235,6 +235,7 @@ static int lprocfs_call_handler(void *data, int write, loff_t *ppos, 
	}

	}

	return 0;

	return 0;

}

}

EXPORT_SYMBOL(lprocfs_call_handler);





static int __proc_dobitmasks(void *data, int write,

static int __proc_dobitmasks(void *data, int write,

			     loff_t pos, void __user *buffer, int nob)

			     loff_t pos, void __user *buffer, int nob)