Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3cf01f28c303be34f18cb4f6204cf1bdfe12ba7c
Commit:     3cf01f28c303be34f18cb4f6204cf1bdfe12ba7c
Parent:     a1b0aa87647493c0201821ab884e86298d5da7d6
Author:     Jan Harkes <[EMAIL PROTECTED]>
AuthorDate: Thu Jul 19 01:48:51 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Jul 19 10:04:48 2007 -0700

    coda: remove statistics counters from /proc/fs/coda
    
    Similar information can easily be obtained with strace -c.
    
    Signed-off-by: Jan Harkes <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 fs/coda/coda_int.h         |    7 ++
 fs/coda/dir.c              |   16 +---
 fs/coda/file.c             |   10 +--
 fs/coda/psdev.c            |    1 -
 fs/coda/symlink.c          |    2 -
 fs/coda/sysctl.c           |  228 +-------------------------------------------
 fs/coda/upcall.c           |    3 +-
 include/linux/coda_linux.h |    3 -
 include/linux/coda_proc.h  |   76 ---------------
 include/linux/coda_psdev.h |    2 -
 10 files changed, 15 insertions(+), 333 deletions(-)

diff --git a/fs/coda/coda_int.h b/fs/coda/coda_int.h
index 9e6338f..8ccd5ed 100644
--- a/fs/coda/coda_int.h
+++ b/fs/coda/coda_int.h
@@ -1,12 +1,19 @@
 #ifndef _CODA_INT_
 #define _CODA_INT_
 
+struct dentry;
+
 extern struct file_system_type coda_fs_type;
+extern unsigned long coda_timeout;
+extern int coda_hard;
+extern int coda_fake_statfs;
 
 void coda_destroy_inodecache(void);
 int coda_init_inodecache(void);
 int coda_fsync(struct file *coda_file, struct dentry *coda_dentry,
               int datasync);
+void coda_sysctl_init(void);
+void coda_sysctl_clean(void);
 
 #endif  /*  _CODA_INT_  */
 
diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 0c6c48c..04a3dd8 100644
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -25,7 +25,6 @@
 #include <linux/coda_psdev.h>
 #include <linux/coda_fs_i.h>
 #include <linux/coda_cache.h>
-#include <linux/coda_proc.h>
 
 #include "coda_int.h"
 
@@ -148,8 +147,6 @@ int coda_permission(struct inode *inode, int mask, struct 
nameidata *nd)
 
        lock_kernel();
 
-       coda_vfs_stat.permission++;
-
        if (coda_cache_check(inode, mask))
                goto out; 
 
@@ -206,7 +203,6 @@ static int coda_create(struct inode *dir, struct dentry 
*de, int mode, struct na
        struct coda_vattr attrs;
 
        lock_kernel();
-       coda_vfs_stat.create++;
 
        if (coda_isroot(dir) && coda_iscontrol(name, length)) {
                unlock_kernel();
@@ -246,7 +242,6 @@ static int coda_mkdir(struct inode *dir, struct dentry *de, 
int mode)
        struct CodaFid newfid;
 
        lock_kernel();
-       coda_vfs_stat.mkdir++;
 
        if (coda_isroot(dir) && coda_iscontrol(name, len)) {
                unlock_kernel();
@@ -288,7 +283,6 @@ static int coda_link(struct dentry *source_de, struct inode 
*dir_inode,
        int error;
 
        lock_kernel();
-       coda_vfs_stat.link++;
 
        if (coda_isroot(dir_inode) && coda_iscontrol(name, len)) {
                unlock_kernel();
@@ -320,10 +314,9 @@ static int coda_symlink(struct inode *dir_inode, struct 
dentry *de,
         const char *name = de->d_name.name;
        int len = de->d_name.len;
        int symlen;
-        int error=0;
-        
+       int error = 0;
+
        lock_kernel();
-       coda_vfs_stat.symlink++;
 
        if (coda_isroot(dir_inode) && coda_iscontrol(name, len)) {
                unlock_kernel();
@@ -360,7 +353,6 @@ int coda_unlink(struct inode *dir, struct dentry *de)
        int len = de->d_name.len;
 
        lock_kernel();
-       coda_vfs_stat.unlink++;
 
        error = venus_remove(dir->i_sb, coda_i2f(dir), name, len);
        if ( error ) {
@@ -381,7 +373,6 @@ int coda_rmdir(struct inode *dir, struct dentry *de)
        int error;
 
        lock_kernel();
-       coda_vfs_stat.rmdir++;
 
        error = venus_rmdir(dir->i_sb, coda_i2f(dir), name, len);
        if (!error) {
@@ -408,7 +399,6 @@ static int coda_rename(struct inode *old_dir, struct dentry 
*old_dentry,
        int error;
 
        lock_kernel();
-       coda_vfs_stat.rename++;
 
        error = venus_rename(old_dir->i_sb, coda_i2f(old_dir),
                             coda_i2f(new_dir), old_length, new_length,
@@ -445,8 +435,6 @@ int coda_readdir(struct file *coda_file, void *buf, 
filldir_t filldir)
        BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
        host_file = cfi->cfi_container;
 
-       coda_vfs_stat.readdir++;
-
        if (!host_file->f_op)
                return -ENOTDIR;
 
diff --git a/fs/coda/file.c b/fs/coda/file.c
index e7d6227..7594962 100644
--- a/fs/coda/file.c
+++ b/fs/coda/file.c
@@ -22,7 +22,6 @@
 #include <linux/coda_linux.h>
 #include <linux/coda_fs_i.h>
 #include <linux/coda_psdev.h>
-#include <linux/coda_proc.h>
 
 #include "coda_int.h"
 
@@ -134,8 +133,6 @@ int coda_open(struct inode *coda_inode, struct file 
*coda_file)
        unsigned short coda_flags = coda_flags_to_cflags(flags);
        struct coda_file_info *cfi;
 
-       coda_vfs_stat.open++;
-
        cfi = kmalloc(sizeof(struct coda_file_info), GFP_KERNEL);
        if (!cfi)
                return -ENOMEM;
@@ -176,8 +173,6 @@ int coda_flush(struct file *coda_file, fl_owner_t id)
 
        lock_kernel();
 
-       coda_vfs_stat.flush++;
-
        /* last close semantics */
        fcnt = file_count(coda_file);
        if (fcnt > 1)
@@ -219,8 +214,7 @@ int coda_release(struct inode *coda_inode, struct file 
*coda_file)
        int err = 0;
 
        lock_kernel();
-       coda_vfs_stat.release++;
- 
+
        if (!use_coda_close) {
                err = venus_release(coda_inode->i_sb, coda_i2f(coda_inode),
                                    coda_flags);
@@ -271,8 +265,6 @@ int coda_fsync(struct file *coda_file, struct dentry 
*coda_dentry, int datasync)
        BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
        host_file = cfi->cfi_container;
 
-       coda_vfs_stat.fsync++;
-
        if (host_file->f_op && host_file->f_op->fsync) {
                host_dentry = host_file->f_path.dentry;
                host_inode = host_dentry->d_inode;
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index 8a09f19..e3a0a41 100644
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -45,7 +45,6 @@
 #include <linux/coda_linux.h>
 #include <linux/coda_fs_i.h>
 #include <linux/coda_psdev.h>
-#include <linux/coda_proc.h>
 
 #include "coda_int.h"
 
diff --git a/fs/coda/symlink.c b/fs/coda/symlink.c
index 76e00a6..4513b72 100644
--- a/fs/coda/symlink.c
+++ b/fs/coda/symlink.c
@@ -20,7 +20,6 @@
 #include <linux/coda_linux.h>
 #include <linux/coda_psdev.h>
 #include <linux/coda_fs_i.h>
-#include <linux/coda_proc.h>
 
 static int coda_symlink_filler(struct file *file, struct page *page)
 {
@@ -32,7 +31,6 @@ static int coda_symlink_filler(struct file *file, struct page 
*page)
 
        lock_kernel();
        cii = ITOC(inode);
-       coda_vfs_stat.follow_link++;
 
        error = venus_readlink(inode->i_sb, &cii->c_fid, p, &len);
        unlock_kernel();
diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c
index c57a1fa..81b7771 100644
--- a/fs/coda/sysctl.c
+++ b/fs/coda/sysctl.c
@@ -5,181 +5,14 @@
  * 
  * Carnegie Mellon encourages users to contribute improvements to
  * the Coda project. Contact Peter Braam ([EMAIL PROTECTED]).
- * 
- * CODA operation statistics
- * (c) March, 1998 Zhanyong Wan <[EMAIL PROTECTED]>
- *
  */
 
-#include <linux/time.h>
-#include <linux/mm.h>
 #include <linux/sysctl.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/slab.h>
-#include <linux/stat.h>
-#include <linux/ctype.h>
-#include <linux/bitops.h>
-#include <asm/uaccess.h>
-#include <linux/utsname.h>
-#include <linux/module.h>
 
-#include <linux/coda.h>
-#include <linux/coda_linux.h>
-#include <linux/coda_fs_i.h>
-#include <linux/coda_psdev.h>
-#include <linux/coda_cache.h>
-#include <linux/coda_proc.h>
+#include "coda_int.h"
 
 static struct ctl_table_header *fs_table_header;
 
-#define CODA_TIMEOUT    3       /* timeout on upcalls to become intrble */
-#define CODA_HARD       5       /* mount type "hard" or "soft" */
-#define CODA_VFS        6       /* vfs statistics */
-#define CODA_CACHE_INV          9       /* cache invalidation statistics */
-#define CODA_FAKE_STATFS 10     /* don't query venus for actual cache usage */
-
-struct coda_vfs_stats          coda_vfs_stat;
-static struct coda_cache_inv_stats     coda_cache_inv_stat;
-
-static void reset_coda_vfs_stats( void )
-{
-       memset( &coda_vfs_stat, 0, sizeof( coda_vfs_stat ) );
-}
-
-static void reset_coda_cache_inv_stats( void )
-{
-       memset( &coda_cache_inv_stat, 0, sizeof( coda_cache_inv_stat ) );
-}
-
-static int do_reset_coda_vfs_stats( ctl_table * table, int write,
-                                   struct file * filp, void __user * buffer,
-                                   size_t * lenp, loff_t * ppos )
-{
-       if ( write ) {
-               reset_coda_vfs_stats();
-
-               *ppos += *lenp;
-       } else {
-               *lenp = 0;
-       }
-
-       return 0;
-}
-
-static int do_reset_coda_cache_inv_stats( ctl_table * table, int write,
-                                         struct file * filp,
-                                         void __user * buffer,
-                                         size_t * lenp, loff_t * ppos )
-{
-       if ( write ) {
-               reset_coda_cache_inv_stats();
-
-               *ppos += *lenp;
-       } else {
-               *lenp = 0;
-       }
-  
-       return 0;
-}
-
-static int proc_vfs_stats_show(struct seq_file *m, void *v)
-{
-       struct coda_vfs_stats * ps = & coda_vfs_stat;
-  
-       seq_printf(m,
-                       "Coda VFS statistics\n"
-                       "===================\n\n"
-                       "File Operations:\n"
-                       "\topen\t\t%9d\n"
-                       "\tflush\t\t%9d\n"
-                       "\trelease\t\t%9d\n"
-                       "\tfsync\t\t%9d\n\n"
-                       "Dir Operations:\n"
-                       "\treaddir\t\t%9d\n\n"
-                       "Inode Operations\n"
-                       "\tcreate\t\t%9d\n"
-                       "\tlookup\t\t%9d\n"
-                       "\tlink\t\t%9d\n"
-                       "\tunlink\t\t%9d\n"
-                       "\tsymlink\t\t%9d\n"
-                       "\tmkdir\t\t%9d\n"
-                       "\trmdir\t\t%9d\n"
-                       "\trename\t\t%9d\n"
-                       "\tpermission\t%9d\n",
-
-                       /* file operations */
-                       ps->open,
-                       ps->flush,
-                       ps->release,
-                       ps->fsync,
-
-                       /* dir operations */
-                       ps->readdir,
-                 
-                       /* inode operations */
-                       ps->create,
-                       ps->lookup,
-                       ps->link,
-                       ps->unlink,
-                       ps->symlink,
-                       ps->mkdir,
-                       ps->rmdir,
-                       ps->rename,
-                       ps->permission); 
-       return 0;
-}
-
-static int proc_cache_inv_stats_show(struct seq_file *m, void *v)
-{
-       struct coda_cache_inv_stats * ps = & coda_cache_inv_stat;
-  
-       seq_printf(m,
-                       "Coda cache invalidation statistics\n"
-                       "==================================\n\n"
-                       "flush\t\t%9d\n"
-                       "purge user\t%9d\n"
-                       "zap_dir\t\t%9d\n"
-                       "zap_file\t%9d\n"
-                       "zap_vnode\t%9d\n"
-                       "purge_fid\t%9d\n"
-                       "replace\t\t%9d\n",
-                       ps->flush,
-                       ps->purge_user,
-                       ps->zap_dir,
-                       ps->zap_file,
-                       ps->zap_vnode,
-                       ps->purge_fid,
-                       ps->replace );
-       return 0;
-}
-
-static int proc_vfs_stats_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, proc_vfs_stats_show, NULL);
-}
-
-static int proc_cache_inv_stats_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, proc_cache_inv_stats_show, NULL);
-}
-
-static const struct file_operations proc_vfs_stats_fops = {
-       .owner          = THIS_MODULE,
-       .open           = proc_vfs_stats_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
-static const struct file_operations proc_cache_inv_stats_fops = {
-       .owner          = THIS_MODULE,
-       .open           = proc_cache_inv_stats_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
 static ctl_table coda_table[] = {
        {
                .ctl_name       = CTL_UNNUMBERED,
@@ -199,22 +32,6 @@ static ctl_table coda_table[] = {
        },
        {
                .ctl_name       = CTL_UNNUMBERED,
-               .procname       = "vfs_stats",
-               .data           = NULL,
-               .maxlen         = 0,
-               .mode           = 0644,
-               .proc_handler   = &do_reset_coda_vfs_stats
-       },
-       {
-               .ctl_name       = CTL_UNNUMBERED,
-               .procname       = "cache_inv_stats",
-               .data           = NULL,
-               .maxlen         = 0,
-               .mode           = 0644,
-               .proc_handler   = &do_reset_coda_cache_inv_stats
-       },
-       {
-               .ctl_name       = CTL_UNNUMBERED,
                .procname       = "fake_statfs",
                .data           = &coda_fake_statfs,
                .maxlen         = sizeof(int),
@@ -235,59 +52,20 @@ static ctl_table fs_table[] = {
 };
 
 
-#ifdef CONFIG_PROC_FS
-
-/*
- target directory structure:
-   /proc/fs  (see linux/fs/proc/root.c)
-   /proc/fs/coda
-   /proc/fs/coda/{vfs_stats,
-
-*/
-
-static struct proc_dir_entry* proc_fs_coda;
-
-#endif
-
 void coda_sysctl_init(void)
 {
-       reset_coda_vfs_stats();
-       reset_coda_cache_inv_stats();
-
-#ifdef CONFIG_PROC_FS
-       proc_fs_coda = proc_mkdir("coda", proc_root_fs);
-       if (proc_fs_coda) {
-               struct proc_dir_entry *pde;
-
-               proc_fs_coda->owner = THIS_MODULE;
-               pde = create_proc_entry("vfs_stats", 0, proc_fs_coda);
-               if (pde)
-                       pde->proc_fops = &proc_vfs_stats_fops;
-               pde = create_proc_entry("cache_inv_stats", 0, proc_fs_coda);
-               if (pde)
-                       pde->proc_fops = &proc_cache_inv_stats_fops;
-       }
-#endif
-
 #ifdef CONFIG_SYSCTL
        if ( !fs_table_header )
                fs_table_header = register_sysctl_table(fs_table);
-#endif 
+#endif
 }
 
-void coda_sysctl_clean(void) 
+void coda_sysctl_clean(void)
 {
-
 #ifdef CONFIG_SYSCTL
        if ( fs_table_header ) {
                unregister_sysctl_table(fs_table_header);
                fs_table_header = NULL;
        }
 #endif
-
-#ifdef CONFIG_PROC_FS
-        remove_proc_entry("cache_inv_stats", proc_fs_coda);
-        remove_proc_entry("vfs_stats", proc_fs_coda);
-       remove_proc_entry("coda", proc_root_fs);
-#endif 
 }
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index 9a20a3b..e4e766e 100644
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -35,7 +35,8 @@
 #include <linux/coda_psdev.h>
 #include <linux/coda_fs_i.h>
 #include <linux/coda_cache.h>
-#include <linux/coda_proc.h> 
+
+#include "coda_int.h"
 
 static int coda_upcall(struct venus_comm *vc, int inSize, int *outSize,
                       union inputArgs *buffer);
diff --git a/include/linux/coda_linux.h b/include/linux/coda_linux.h
index e4ac016..c4079b4 100644
--- a/include/linux/coda_linux.h
+++ b/include/linux/coda_linux.h
@@ -43,9 +43,6 @@ int coda_revalidate_inode(struct dentry *);
 int coda_getattr(struct vfsmount *, struct dentry *, struct kstat *);
 int coda_setattr(struct dentry *, struct iattr *);
 
-/* global variables */
-extern int coda_fake_statfs;
-
 /* this file:  heloers */
 static __inline__ struct CodaFid *coda_i2f(struct inode *);
 static __inline__ char *coda_i2s(struct inode *);
diff --git a/include/linux/coda_proc.h b/include/linux/coda_proc.h
deleted file mode 100644
index 0dc1b04..0000000
--- a/include/linux/coda_proc.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * coda_statis.h
- * 
- * CODA operation statistics
- *
- * (c) March, 1998
- * by Michihiro Kuramochi, Zhenyu Xia and Zhanyong Wan
- * [EMAIL PROTECTED]
- *
- */
-
-#ifndef _CODA_PROC_H
-#define _CODA_PROC_H
-
-void coda_sysctl_init(void);
-void coda_sysctl_clean(void);
-
-#include <linux/sysctl.h>
-#include <linux/coda_fs_i.h>
-#include <linux/coda.h>
-
-/* these four files are presented to show the result of the statistics:
- *
- *     /proc/fs/coda/vfs_stats
- *                   cache_inv_stats
- *
- * these four files are presented to reset the statistics to 0:
- *
- *     /proc/sys/coda/vfs_stats
- *                    cache_inv_stats
- */
-
-/* VFS operation statistics */
-struct coda_vfs_stats 
-{
-       /* file operations */
-       int open;
-       int flush;
-       int release;
-       int fsync;
-
-       /* dir operations */
-       int readdir;
-  
-       /* inode operations */
-       int create;
-       int lookup;
-       int link;
-       int unlink;
-       int symlink;
-       int mkdir;
-       int rmdir;
-       int rename;
-       int permission;
-
-       /* symlink operatoins*/
-       int follow_link;
-       int readlink;
-};
-
-/* cache invalidation statistics */
-struct coda_cache_inv_stats
-{
-       int flush;
-       int purge_user;
-       int zap_dir;
-       int zap_file;
-       int zap_vnode;
-       int purge_fid;
-       int replace;
-};
-
-/* these global variables hold the actual statistics data */
-extern struct coda_vfs_stats           coda_vfs_stat;
-
-#endif /* _CODA_PROC_H */
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
index 81b2e4c..aa8f454 100644
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.h
@@ -69,8 +69,6 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs);
 
 
 /* messages between coda filesystem in kernel and Venus */
-extern int coda_hard;
-extern unsigned long coda_timeout;
 struct upc_req {
        struct list_head    uc_chain;
        caddr_t             uc_data;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to