vfs: Re-introduce s_uuid in the superblock
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Apr 2011 22:21:04 +0000 (15:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Apr 2011 22:21:04 +0000 (15:21 -0700)
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>
include/linux/fs.h

index 5b14843af9f9fe52d8c1059981fb4e1bfb736dbc..dbd860af08041bbaa5e333104aaa3ab0849cb676 100644 (file)
@@ -1403,6 +1403,7 @@ struct super_block {
        wait_queue_head_t       s_wait_unfrozen;
 
        char s_id[32];                          /* Informational name */
+       u8 s_uuid[16];                          /* UUID */
 
        void                    *s_fs_info;     /* Filesystem private info */
        fmode_t                 s_mode;