diff options
Diffstat (limited to 'fs/namespace.c')
-rw-r--r-- | fs/namespace.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 9263995bf6a1..d99bcf59e4c2 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -1030,18 +1030,6 @@ const struct seq_operations mounts_op = { | |||
1030 | .show = show_vfsmnt | 1030 | .show = show_vfsmnt |
1031 | }; | 1031 | }; |
1032 | 1032 | ||
1033 | static int uuid_is_nil(u8 *uuid) | ||
1034 | { | ||
1035 | int i; | ||
1036 | u8 *cp = (u8 *)uuid; | ||
1037 | |||
1038 | for (i = 0; i < 16; i++) { | ||
1039 | if (*cp++) | ||
1040 | return 0; | ||
1041 | } | ||
1042 | return 1; | ||
1043 | } | ||
1044 | |||
1045 | static int show_mountinfo(struct seq_file *m, void *v) | 1033 | static int show_mountinfo(struct seq_file *m, void *v) |
1046 | { | 1034 | { |
1047 | struct proc_mounts *p = m->private; | 1035 | struct proc_mounts *p = m->private; |
@@ -1085,10 +1073,6 @@ static int show_mountinfo(struct seq_file *m, void *v) | |||
1085 | if (IS_MNT_UNBINDABLE(mnt)) | 1073 | if (IS_MNT_UNBINDABLE(mnt)) |
1086 | seq_puts(m, " unbindable"); | 1074 | seq_puts(m, " unbindable"); |
1087 | 1075 | ||
1088 | if (!uuid_is_nil(mnt->mnt_sb->s_uuid)) | ||
1089 | /* print the uuid */ | ||
1090 | seq_printf(m, " uuid:%pU", mnt->mnt_sb->s_uuid); | ||
1091 | |||
1092 | /* Filesystem specific data */ | 1076 | /* Filesystem specific data */ |
1093 | seq_puts(m, " - "); | 1077 | seq_puts(m, " - "); |
1094 | show_type(m, sb); | 1078 | show_type(m, sb); |
@@ -2701,7 +2685,7 @@ void __init mnt_init(void) | |||
2701 | if (!mount_hashtable) | 2685 | if (!mount_hashtable) |
2702 | panic("Failed to allocate mount hash table\n"); | 2686 | panic("Failed to allocate mount hash table\n"); |
2703 | 2687 | ||
2704 | printk("Mount-cache hash table entries: %lu\n", HASH_SIZE); | 2688 | printk(KERN_INFO "Mount-cache hash table entries: %lu\n", HASH_SIZE); |
2705 | 2689 | ||
2706 | for (u = 0; u < HASH_SIZE; u++) | 2690 | for (u = 0; u < HASH_SIZE; u++) |
2707 | INIT_LIST_HEAD(&mount_hashtable[u]); | 2691 | INIT_LIST_HEAD(&mount_hashtable[u]); |