aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-12 16:35:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-12 16:35:56 -0400
commitbe85bccaa5aa5a11dcaf85f9e945ffefd253f631 (patch)
tree342a0c1529d077ec499f62dfa01ff4697387f1ab /include
parent16ad56972ca3161eb97583897f17c1ead0c4ebd0 (diff)
Revert "vfs: Export file system uuid via /proc/<pid>/mountinfo"
This reverts commit 93f1c20bc8cdb757be50566eff88d65c3b26881f. It turns out that libmount misparses it because it adds a '-' character in the uuid string, which libmount then incorrectly confuses with the separator string (" - ") at the end of all the optional arguments. Upstream libmount (in the util-linux tree) has been fixed, but until that fix actually percolates up to users, we'd better not expose this change in the kernel. Let's revisit this later (possibly by exposing the UUID without any '-' characters in it, avoiding the user-space bug). Reported-by: Dave Jones <davej@redhat.com> Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Karel Zak <kzak@redhat.com> Cc: Ram Pai <linuxram@us.ibm.com> Cc: Miklos Szeredi <mszeredi@suse.cz> Cc: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index dbd860af080..5b14843af9f 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1403,7 +1403,6 @@ struct super_block {
1403 wait_queue_head_t s_wait_unfrozen; 1403 wait_queue_head_t s_wait_unfrozen;
1404 1404
1405 char s_id[32]; /* Informational name */ 1405 char s_id[32]; /* Informational name */
1406 u8 s_uuid[16]; /* UUID */
1407 1406
1408 void *s_fs_info; /* Filesystem private info */ 1407 void *s_fs_info; /* Filesystem private info */
1409 fmode_t s_mode; 1408 fmode_t s_mode;