[PATCH] efs: make a struct static (fwd)

The patch below makes a needessly global struct in the efs code static.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/efs/super.c b/fs/efs/super.c
index af4d01e2730ae9000aab81c9e627a2f47b2209be..d8d5ea9a999728d84ec10f6909b893e532653b61 100644 (file)
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -32,6 +32,26 @@ static struct file_system_type efs_fs_type = {
        .fs_flags       = FS_REQUIRES_DEV,
 };
 
+static struct pt_types sgi_pt_types[] = {
+       {0x00,          "SGI vh"},
+       {0x01,          "SGI trkrepl"},
+       {0x02,          "SGI secrepl"},
+       {0x03,          "SGI raw"},
+       {0x04,          "SGI bsd"},
+       {SGI_SYSV,      "SGI sysv"},
+       {0x06,          "SGI vol"},
+       {SGI_EFS,       "SGI efs"},
+       {0x08,          "SGI lv"},
+       {0x09,          "SGI rlv"},
+       {0x0A,          "SGI xfs"},
+       {0x0B,          "SGI xfslog"},
+       {0x0C,          "SGI xlv"},
+       {0x82,          "Linux swap"},
+       {0x83,          "Linux native"},
+       {0,             NULL}
+};
+
+
 static kmem_cache_t * efs_inode_cachep;
 
 static struct inode *efs_alloc_inode(struct super_block *sb)

diff --git a/include/linux/efs_vh.h b/include/linux/efs_vh.h
index b3df61ef2eb28d3e343f110fa14b54def6e2e1c7..8a11150c61febf1685571c6557b328926967d2dd 100644 (file)
--- a/include/linux/efs_vh.h
+++ b/include/linux/efs_vh.h
@@ -47,23 +47,6 @@ struct volume_header {
 struct pt_types {
        int     pt_type;
        char    *pt_name;
-} sgi_pt_types[] = {
-       {0x00,          "SGI vh"},
-       {0x01,          "SGI trkrepl"},
-       {0x02,          "SGI secrepl"},
-       {0x03,          "SGI raw"},
-       {0x04,          "SGI bsd"},
-       {SGI_SYSV,      "SGI sysv"},
-       {0x06,          "SGI vol"},
-       {SGI_EFS,       "SGI efs"},
-       {0x08,          "SGI lv"},
-       {0x09,          "SGI rlv"},
-       {0x0A,          "SGI xfs"},
-       {0x0B,          "SGI xfslog"},
-       {0x0C,          "SGI xlv"},
-       {0x82,          "Linux swap"},
-       {0x83,          "Linux native"},
-       {0,             NULL}
 };
 
 #endif /* __EFS_VH_H__ */