Skip to contentSkip to conversation

cifs: show features compiled in as part of DebugData

PATCH In review Suresh Jayaraman 4 participants 7 messages Jul 30, 2010 – Aug 4, 2010 3 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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

Fixed the nit pointed out by Jeff.

From: Suresh Jayaraman <[email protected]>
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.

---
 fs/cifs/cifs_debug.c |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
fs/cifs/cifs_debug.c +25 -0
index 4fce6e6..eb1ba49 100644
@@ -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 on v1 1/2
#1 lore raw
Quoted 53 lines · On Fri, 30 Jul 2010 18:25:56 +0530 Suresh Jayaraman…

Fixed the nit pointed out by Jeff.

From: Suresh Jayaraman <[email protected]>
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.

---
 fs/cifs/cifs_debug.c |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
fs/cifs/cifs_debug.c +18 -0
index 4fce6e6..eb1ba49 100644
@@ -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

fs/cifs/cifs_debug.c static int cifs_debug_data_proc_show(struct seq_file *m, void *v) · line 149

Quoted 10 lines
fs/cifs/cifs_debug.c +7 -0
+	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:");
 
#2 lore raw
In reply to Suresh Jayaraman

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.

Quoted 7 lines · Suresh Jayaraman

Fixed the nit pointed out by Jeff.

From: Suresh Jayaraman <[email protected]>
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:

Signature · 3 lines
Thanks,

Steve

A message that is not in the archive (sent off-list or not yet received): AANLkTikgA8mXTcX-i3avjuQygrekicntcy3P2NBW5QuB-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#4 lore raw
Quoted 5 lines · On Fri, 30 Jul 2010 09:39:04 -0500 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.

Quoted 11 lines
Quoted 7 lines · Suresh Jayaraman

Fixed the nit pointed out by Jeff.

From: Suresh Jayaraman <[email protected]>
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 :)

Signature · 1 line
Jeff Layton <[email protected]>

A message that is not in the archive (sent off-list or not yet received): 20100730105734.0827c057-4QP7MXygkU+dMjc06nkz3ljfA9RmPOcC@public.gmane.org

#6 lore raw
Quoted 20 lines · Jeff Layton
Quoted 5 lines · On Fri, 30 Jul 2010 09:39:04 -0500 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.

Quoted 11 lines
Quoted 7 lines · Suresh Jayaraman

Fixed the nit pointed out by Jeff.

From: Suresh Jayaraman <[email protected]>
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:

Quoted 5 lines

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

Signature · 3 lines
Thanks,

Steve

A message that is not in the archive (sent off-list or not yet received): AANLkTinyH4qiEBwtULoen8xSypaWxWCr3MQhDWf-Ftz4-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#8 lore raw

merged.

Quoted 35 lines · Steve French
Quoted 20 lines · Jeff Layton
Quoted 5 lines · On Fri, 30 Jul 2010 09:39:04 -0500 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.

Quoted 11 lines
Quoted 7 lines · Suresh Jayaraman

Fixed the nit pointed out by Jeff.

From: Suresh Jayaraman <[email protected]>
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:

Quoted 5 lines

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

Signature · 3 lines
Thanks,

Steve
#9 lore raw
In reply to a message not in the archive
Quoted 4 lines · 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.

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,

Quoted 10 lines · Suresh Jayaraman
Quoted 7 lines

Fixed the nit pointed out by Jeff.

From: Suresh Jayaraman <[email protected]>
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:

Signature · 1 line
Suresh Jayaraman