xfs: remove subdirectories

Use the move from Linux 2.6 to Linux 3.x as an excuse to kill the
annoying subdirectories in the XFS source code.  Besides the large
amount of file rename the only changes are to the Makefile, a few
files including headers with the subdirectory prefix, and the binary
sysctl compat code that includes a header under fs/xfs/ from
kernel/.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>

1 files changed, 122 insertions, 0 deletions

diff --git a/fs/xfs/xfs_stats.c b/fs/xfs/xfs_stats.c
new file mode 100644
index 000000000000..76fdc5861932
--- /dev/null
+++ b/fs/xfs/xfs_stats.c
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include "xfs.h"
+#include <linux/proc_fs.h>
+
+DEFINE_PER_CPU(struct xfsstats, xfsstats);
+
+static int xfs_stat_proc_show(struct seq_file *m, void *v)
+{
+        int             c, i, j, val;
+        __uint64_t      xs_xstrat_bytes = 0;
+        __uint64_t      xs_write_bytes = 0;
+        __uint64_t      xs_read_bytes = 0;
+
+        static const struct xstats_entry {
+                char    *desc;
+                int     endpoint;
+        } xstats[] = {
+                { "extent_alloc",       XFSSTAT_END_EXTENT_ALLOC        },
+                { "abt",                XFSSTAT_END_ALLOC_BTREE         },
+                { "blk_map",            XFSSTAT_END_BLOCK_MAPPING       },
+                { "bmbt",               XFSSTAT_END_BLOCK_MAP_BTREE     },
+                { "dir",                XFSSTAT_END_DIRECTORY_OPS       },
+                { "trans",              XFSSTAT_END_TRANSACTIONS        },
+                { "ig",                 XFSSTAT_END_INODE_OPS           },
+                { "log",                XFSSTAT_END_LOG_OPS             },
+                { "push_ail",           XFSSTAT_END_TAIL_PUSHING        },
+                { "xstrat",             XFSSTAT_END_WRITE_CONVERT       },
+                { "rw",                 XFSSTAT_END_READ_WRITE_OPS      },
+                { "attr",               XFSSTAT_END_ATTRIBUTE_OPS       },
+                { "icluster",           XFSSTAT_END_INODE_CLUSTER       },
+                { "vnodes",             XFSSTAT_END_VNODE_OPS           },
+                { "buf",                XFSSTAT_END_BUF                 },
+                { "abtb2",              XFSSTAT_END_ABTB_V2             },
+                { "abtc2",              XFSSTAT_END_ABTC_V2             },
+                { "bmbt2",              XFSSTAT_END_BMBT_V2             },
+                { "ibt2",               XFSSTAT_END_IBT_V2              },
+        };
+
+        /* Loop over all stats groups */
+        for (i=j = 0; i < ARRAY_SIZE(xstats); i++) {
+                seq_printf(m, "%s", xstats[i].desc);
+                /* inner loop does each group */
+                while (j < xstats[i].endpoint) {
+                        val = 0;
+                        /* sum over all cpus */
+                        for_each_possible_cpu(c)
+                                val += *(((__u32*)&per_cpu(xfsstats, c) + j));
+                        seq_printf(m, " %u", val);
+                        j++;
+                }
+                seq_putc(m, '\n');
+        }
+        /* extra precision counters */
+        for_each_possible_cpu(i) {
+                xs_xstrat_bytes += per_cpu(xfsstats, i).xs_xstrat_bytes;
+                xs_write_bytes += per_cpu(xfsstats, i).xs_write_bytes;
+                xs_read_bytes += per_cpu(xfsstats, i).xs_read_bytes;
+        }
+
+        seq_printf(m, "xpc %Lu %Lu %Lu\n",
+                        xs_xstrat_bytes, xs_write_bytes, xs_read_bytes);
+        seq_printf(m, "debug %u\n",
+#if defined(DEBUG)
+                1);
+#else
+                0);
+#endif
+        return 0;
+}
+
+static int xfs_stat_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, xfs_stat_proc_show, NULL);
+}
+
+static const struct file_operations xfs_stat_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = xfs_stat_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+int
+xfs_init_procfs(void)
+{
+        if (!proc_mkdir("fs/xfs", NULL))
+                goto out;
+
+        if (!proc_create("fs/xfs/stat", 0, NULL,
+                         &xfs_stat_proc_fops))
+                goto out_remove_entry;
+        return 0;
+
+ out_remove_entry:
+        remove_proc_entry("fs/xfs", NULL);
+ out:
+        return -ENOMEM;
+}
+
+void
+xfs_cleanup_procfs(void)
+{
+        remove_proc_entry("fs/xfs/stat", NULL);
+        remove_proc_entry("fs/xfs", NULL);
+}