aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-12 18:21:04 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-12 18:21:04 -0400
commit0bba01695b74fdd2f9286243bb39f88544d81401 (patch)
treedc5d4af6a7930138c09598a81a64dd3e57344f7c
parente328f05dd6c528fcc9eb6da157dd865dfe611352 (diff)
vfs: Re-introduce s_uuid in the superblock
Gaah. When commit be85bccaa5aa reverted the export of file system uuid via /proc/<pid>/mountinfo, it also unintentionally removed the s_uuid field in struct super_block. I didn't mean to do that, since filesystems have been taught to fill it in (and we want to keep it for future re-introduction in the mountinfo file). Stupid of me. This adds it back in. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/fs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 5b14843af9f9..dbd860af0804 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1403,6 +1403,7 @@ 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 */
1406 1407
1407 void *s_fs_info; /* Filesystem private info */ 1408 void *s_fs_info; /* Filesystem private info */
1408 fmode_t s_mode; 1409 fmode_t s_mode;