[PATCH 1/2] cifs: show features compiled in as part of DebugData

[PATCH 1/2] cifs: show features compiled in as part of DebugData

[Suresh Jayaraman]

From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>
Subject: [PATCH 1/2] cifs: show features compiled in as part of DebugData

This patch adds the features that are compiled in to the CIFS debugging data
as shown below:

	$cat /proc/fs/cifs/DebugData 
	Display Internal CIFS Data Structures for Debugging
	---------------------------------------------------
	CIFS Version 1.64
	Features: dfs fscache posix spnego xattr 
	Active VFS Requests: 0
	...

This patch provides a definitive way to tell what features are currently
enabled in the running kernel. This could also help debugging.

Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>
Cc: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 fs/cifs/cifs_debug.c |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 4fce6e6..fdb2db5 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -119,6 +119,32 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
 		    "Display Internal CIFS Data Structures for Debugging\n"
 		    "---------------------------------------------------\n");
 	seq_printf(m, "CIFS Version %s\n", CIFS_VERSION);
+	seq_printf(m, "Features: ");
+#ifdef CONFIG_CIFS_DFS_UPCALL
+	seq_printf(m, "dfs");
+	seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_FSCACHE
+	seq_printf(m, "fscache");
+	seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_WEAK_PW_HASH
+	seq_printf(m, "lanman");
+	seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_POSIX
+	seq_printf(m, "posix");
+	seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_UPCALL
+	seq_printf(m, "spnego");
+	seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_XATTR
+	seq_printf(m, "xattr");
+	seq_putc(m, ' ');
+#endif
+	seq_putc(m, '\n');
 	seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid);
 	seq_printf(m, "Servers:");
 

Re: [PATCH 1/2] cifs: show features compiled in as part of DebugData

[Jeff Layton]

On Fri, 30 Jul 2010 17:57:22 +0530
Suresh Jayaraman <sjayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org> wrote:

> From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>
> Subject: [PATCH 1/2] cifs: show features compiled in as part of DebugData
> 
> This patch adds the features that are compiled in to the CIFS debugging data
> as shown below:
> 
> 	$cat /proc/fs/cifs/DebugData 
> 	Display Internal CIFS Data Structures for Debugging
> 	---------------------------------------------------
> 	CIFS Version 1.64
> 	Features: dfs fscache posix spnego xattr 
> 	Active VFS Requests: 0
> 	...
> 
> This patch provides a definitive way to tell what features are currently
> enabled in the running kernel. This could also help debugging.
> 
> Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>
> Cc: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
>  fs/cifs/cifs_debug.c |   26 ++++++++++++++++++++++++++
>  1 files changed, 26 insertions(+), 0 deletions(-)
> 
> diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
> index 4fce6e6..fdb2db5 100644
> --- a/fs/cifs/cifs_debug.c
> +++ b/fs/cifs/cifs_debug.c
> @@ -119,6 +119,32 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
>  		    "Display Internal CIFS Data Structures for Debugging\n"
>  		    "---------------------------------------------------\n");
>  	seq_printf(m, "CIFS Version %s\n", CIFS_VERSION);
> +	seq_printf(m, "Features: ");
> +#ifdef CONFIG_CIFS_DFS_UPCALL
> +	seq_printf(m, "dfs");
> +	seq_putc(m, ' ');
> +#endif
> +#ifdef CONFIG_CIFS_FSCACHE
> +	seq_printf(m, "fscache");
> +	seq_putc(m, ' ');
> +#endif
> +#ifdef CONFIG_CIFS_WEAK_PW_HASH
> +	seq_printf(m, "lanman");
> +	seq_putc(m, ' ');
> +#endif
> +#ifdef CONFIG_CIFS_POSIX
> +	seq_printf(m, "posix");
> +	seq_putc(m, ' ');
> +#endif
> +#ifdef CONFIG_CIFS_UPCALL
> +	seq_printf(m, "spnego");
> +	seq_putc(m, ' ');
> +#endif
> +#ifdef CONFIG_CIFS_XATTR
> +	seq_printf(m, "xattr");
> +	seq_putc(m, ' ');
	^^^^^^
	Nit -- this space isn't needed.
> +#endif
> +	seq_putc(m, '\n');
>  	seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid);
>  	seq_printf(m, "Servers:");
>  
> 
> 

Other than that, looks good.
-- 
Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

[PATCH 1/2] cifs: show features compiled in as part of DebugData

[Suresh Jayaraman]

Fixed the nit pointed out by Jeff.

From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>
Subject: [PATCH 1/2] cifs: show features compiled in as part of DebugData

This patch adds the features that are compiled in to the CIFS debugging data
as shown below:

	$cat /proc/fs/cifs/DebugData 
	Display Internal CIFS Data Structures for Debugging
	---------------------------------------------------
	CIFS Version 1.64
	Features: dfs fscache posix spnego xattr 
	Active VFS Requests: 0
	...

This patch provides a definitive way to tell what features are currently
enabled in the running kernel. This could also help debugging.

Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>
Cc: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 fs/cifs/cifs_debug.c |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 4fce6e6..eb1ba49 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -119,6 +119,31 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
 		    "Display Internal CIFS Data Structures for Debugging\n"
 		    "---------------------------------------------------\n");
 	seq_printf(m, "CIFS Version %s\n", CIFS_VERSION);
+	seq_printf(m, "Features: ");
+#ifdef CONFIG_CIFS_DFS_UPCALL
+	seq_printf(m, "dfs");
+	seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_FSCACHE
+	seq_printf(m, "fscache");
+	seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_WEAK_PW_HASH
+	seq_printf(m, "lanman");
+	seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_POSIX
+	seq_printf(m, "posix");
+	seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_UPCALL
+	seq_printf(m, "spnego");
+	seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_XATTR
+	seq_printf(m, "xattr");
+#endif
+	seq_putc(m, '\n');
 	seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid);
 	seq_printf(m, "Servers:");
 

Re: [PATCH 1/2] cifs: show features compiled in as part of DebugData

[Jeff Layton]

On Fri, 30 Jul 2010 18:25:56 +0530
Suresh Jayaraman <sjayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org> wrote:

> Fixed the nit pointed out by Jeff.
> 
> From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>
> Subject: [PATCH 1/2] cifs: show features compiled in as part of DebugData
> 
> This patch adds the features that are compiled in to the CIFS debugging data
> as shown below:
> 
> 	$cat /proc/fs/cifs/DebugData 
> 	Display Internal CIFS Data Structures for Debugging
> 	---------------------------------------------------
> 	CIFS Version 1.64
> 	Features: dfs fscache posix spnego xattr 
> 	Active VFS Requests: 0
> 	...
> 
> This patch provides a definitive way to tell what features are currently
> enabled in the running kernel. This could also help debugging.
> 
> Signed-off-by: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>
> Cc: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
>  fs/cifs/cifs_debug.c |   25 +++++++++++++++++++++++++
>  1 files changed, 25 insertions(+), 0 deletions(-)
> 
> diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
> index 4fce6e6..eb1ba49 100644
> --- a/fs/cifs/cifs_debug.c
> +++ b/fs/cifs/cifs_debug.c
> @@ -119,6 +119,31 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
>  		    "Display Internal CIFS Data Structures for Debugging\n"
>  		    "---------------------------------------------------\n");
>  	seq_printf(m, "CIFS Version %s\n", CIFS_VERSION);
> +	seq_printf(m, "Features: ");
> +#ifdef CONFIG_CIFS_DFS_UPCALL
> +	seq_printf(m, "dfs");
> +	seq_putc(m, ' ');
> +#endif
> +#ifdef CONFIG_CIFS_FSCACHE
> +	seq_printf(m, "fscache");
> +	seq_putc(m, ' ');
> +#endif
> +#ifdef CONFIG_CIFS_WEAK_PW_HASH
> +	seq_printf(m, "lanman");
> +	seq_putc(m, ' ');
> +#endif
> +#ifdef CONFIG_CIFS_POSIX
> +	seq_printf(m, "posix");
> +	seq_putc(m, ' ');
> +#endif
> +#ifdef CONFIG_CIFS_UPCALL
> +	seq_printf(m, "spnego");
> +	seq_putc(m, ' ');
> +#endif
> +#ifdef CONFIG_CIFS_XATTR
> +	seq_printf(m, "xattr");
> +#endif
> +	seq_putc(m, '\n');
>  	seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid);
>  	seq_printf(m, "Servers:");
>  
> 
> 

Acked-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Re: [PATCH 1/2] cifs: show features compiled in as part of DebugData

[Steve French]

If someone ever wants a script to parse this - seems like your
(original?) idea of putting this in /proc/fs/cifs/features instead of
/proc/fs/cifs/DebugData (which has various other pieces of debug
information) could be easier.

On Fri, Jul 30, 2010 at 7:55 AM, Suresh Jayaraman <sjayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org> wrote:
> Fixed the nit pointed out by Jeff.
>
> From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>
> Subject: [PATCH 1/2] cifs: show features compiled in as part of DebugData
>
> This patch adds the features that are compiled in to the CIFS debugging data
> as shown below:



-- 
Thanks,

Steve

Re: [PATCH 1/2] cifs: show features compiled in as part of DebugData

[Jeff Layton]

On Fri, 30 Jul 2010 09:39:04 -0500
Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:

> If someone ever wants a script to parse this - seems like your
> (original?) idea of putting this in /proc/fs/cifs/features instead of
> /proc/fs/cifs/DebugData (which has various other pieces of debug
> information) could be easier.
> 
> On Fri, Jul 30, 2010 at 7:55 AM, Suresh Jayaraman <sjayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org> wrote:
> > Fixed the nit pointed out by Jeff.
> >
> > From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>
> > Subject: [PATCH 1/2] cifs: show features compiled in as part of DebugData
> >
> > This patch adds the features that are compiled in to the CIFS debugging data
> > as shown below:
> 
> 
> 

Meh, it's just a matter of adding an extra "grep '^Features: '" to the
script.

I like it DebugData better personally...but this is mainly bikeshed paint
preferences :)

-- 
Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Re: [PATCH 1/2] cifs: show features compiled in as part of DebugData

[Suresh Jayaraman]

On 07/30/2010 08:09 PM, Steve French wrote:
> If someone ever wants a script to parse this - seems like your
> (original?) idea of putting this in /proc/fs/cifs/features instead of
> /proc/fs/cifs/DebugData (which has various other pieces of debug
> information) could be easier.

I'm not sure whether a seperate proc file for features is justified or
not.. Since the primary aim of introducing this is to faciliate
debugging and provide references in documentation etc.., looks like it
is a suitable candidate to DebugData.. but that is a matter of
preference.. Feel free to go ahead with any of these versions..

Thanks,

> On Fri, Jul 30, 2010 at 7:55 AM, Suresh Jayaraman <sjayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org> wrote:
>> Fixed the nit pointed out by Jeff.
>>
>> From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>
>> Subject: [PATCH 1/2] cifs: show features compiled in as part of DebugData
>>
>> This patch adds the features that are compiled in to the CIFS debugging data
>> as shown below:
> 
> 


-- 
Suresh Jayaraman

Re: [PATCH 1/2] cifs: show features compiled in as part of DebugData

[Steve French]

On Fri, Jul 30, 2010 at 9:57 AM, Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> On Fri, 30 Jul 2010 09:39:04 -0500
> Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>
>> If someone ever wants a script to parse this - seems like your
>> (original?) idea of putting this in /proc/fs/cifs/features instead of
>> /proc/fs/cifs/DebugData (which has various other pieces of debug
>> information) could be easier.
>>
>> On Fri, Jul 30, 2010 at 7:55 AM, Suresh Jayaraman <sjayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org> wrote:
>> > Fixed the nit pointed out by Jeff.
>> >
>> > From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>
>> > Subject: [PATCH 1/2] cifs: show features compiled in as part of DebugData
>> >
>> > This patch adds the features that are compiled in to the CIFS debugging data
>> > as shown below:
>>
>>
>>
>
> Meh, it's just a matter of adding an extra "grep '^Features: '" to the
> script.
>
> I like it DebugData better personally...but this is mainly bikeshed paint
> preferences :)

Yes, agree, probably not terribly important - will leave it in DebugData


-- 
Thanks,

Steve

Re: [PATCH 1/2] cifs: show features compiled in as part of DebugData

[Steve French]

merged.

On Fri, Jul 30, 2010 at 12:53 PM, Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> On Fri, Jul 30, 2010 at 9:57 AM, Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>> On Fri, 30 Jul 2010 09:39:04 -0500
>> Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>>
>>> If someone ever wants a script to parse this - seems like your
>>> (original?) idea of putting this in /proc/fs/cifs/features instead of
>>> /proc/fs/cifs/DebugData (which has various other pieces of debug
>>> information) could be easier.
>>>
>>> On Fri, Jul 30, 2010 at 7:55 AM, Suresh Jayaraman <sjayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org> wrote:
>>> > Fixed the nit pointed out by Jeff.
>>> >
>>> > From: Suresh Jayaraman <sjayaraman-l3A5Bk7waGM@public.gmane.org>
>>> > Subject: [PATCH 1/2] cifs: show features compiled in as part of DebugData
>>> >
>>> > This patch adds the features that are compiled in to the CIFS debugging data
>>> > as shown below:
>>>
>>>
>>>
>>
>> Meh, it's just a matter of adding an extra "grep '^Features: '" to the
>> script.
>>
>> I like it DebugData better personally...but this is mainly bikeshed paint
>> preferences :)
>
> Yes, agree, probably not terribly important - will leave it in DebugData
>
>
> --
> Thanks,
>
> Steve
>



-- 
Thanks,

Steve