* [PATCH 7/8] Added /proc/net/rfcomm via bt_procfs_init()
@ 2012-06-14 17:18 Masatake YAMATO
2012-06-15 7:53 ` Andrei Emeltchenko
0 siblings, 1 reply; 2+ messages in thread
From: Masatake YAMATO @ 2012-06-14 17:18 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-bluetooth
Added /proc/net/rfcomm via bt_procfs_init().
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---
net/bluetooth/rfcomm/sock.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index e8707de..0d0a35f 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -1052,8 +1052,18 @@ int __init rfcomm_init_sockets(void)
return err;
err = bt_sock_register(BTPROTO_RFCOMM, &rfcomm_sock_family_ops);
- if (err < 0)
+ if (err < 0) {
+ BT_ERR("RFCOMM socket layer registration failed");
goto error;
+ }
+
+ err = bt_procfs_init(THIS_MODULE, &init_net, "rfcomm", &rfcomm_sk_list, NULL);
+ if (err < 0) {
+ BT_ERR("Failed to create RFCOMM proc file");
+ bt_sock_unregister(BTPROTO_RFCOMM);
+ goto error;
+ }
+
if (bt_debugfs) {
rfcomm_sock_debugfs = debugfs_create_file("rfcomm", 0444,
@@ -1067,13 +1077,14 @@ int __init rfcomm_init_sockets(void)
return 0;
error:
- BT_ERR("RFCOMM socket layer registration failed");
proto_unregister(&rfcomm_proto);
return err;
}
void __exit rfcomm_cleanup_sockets(void)
{
+ bt_procfs_cleanup(&init_net, "rfcomm");
+
debugfs_remove(rfcomm_sock_debugfs);
if (bt_sock_unregister(BTPROTO_RFCOMM) < 0)
--
1.7.10.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 7/8] Added /proc/net/rfcomm via bt_procfs_init()
2012-06-14 17:18 [PATCH 7/8] Added /proc/net/rfcomm via bt_procfs_init() Masatake YAMATO
@ 2012-06-15 7:53 ` Andrei Emeltchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andrei Emeltchenko @ 2012-06-15 7:53 UTC (permalink / raw)
To: Masatake YAMATO; +Cc: linux-kernel, linux-bluetooth
Hi Masatake,
On Fri, Jun 15, 2012 at 02:18:35AM +0900, Masatake YAMATO wrote:
> Added /proc/net/rfcomm via bt_procfs_init().
>
> Signed-off-by: Masatake YAMATO <yamato@redhat.com>
> ---
> net/bluetooth/rfcomm/sock.c | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
> index e8707de..0d0a35f 100644
> --- a/net/bluetooth/rfcomm/sock.c
> +++ b/net/bluetooth/rfcomm/sock.c
> @@ -1052,8 +1052,18 @@ int __init rfcomm_init_sockets(void)
> return err;
>
> err = bt_sock_register(BTPROTO_RFCOMM, &rfcomm_sock_family_ops);
> - if (err < 0)
> + if (err < 0) {
> + BT_ERR("RFCOMM socket layer registration failed");
> goto error;
> + }
> +
> + err = bt_procfs_init(THIS_MODULE, &init_net, "rfcomm", &rfcomm_sk_list, NULL);
> + if (err < 0) {
> + BT_ERR("Failed to create RFCOMM proc file");
> + bt_sock_unregister(BTPROTO_RFCOMM);
> + goto error;
> + }
> +
>
Extra space here.
Best regards
Andrei Emeltchenko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-06-15 7:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-14 17:18 [PATCH 7/8] Added /proc/net/rfcomm via bt_procfs_init() Masatake YAMATO
2012-06-15 7:53 ` Andrei Emeltchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox