Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc

* 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
  Revert "proc: revert /proc/uptime to ->read_proc hook"
  proc 2/2: remove struct proc_dir_entry::owner
  proc 1/2: do PDE usecounting even for ->read_proc, ->write_proc
  proc: fix sparse warnings in pagemap_read()
  proc: move fs/proc/inode-alloc.txt comment into a source file

1 files changed, 0 insertions, 9 deletions

diff --git a/Documentation/DocBook/procfs_example.c b/Documentation/DocBook/procfs_example.c
index 8c6396e4bf31..a5b11793b1e0 100644
--- a/Documentation/DocBook/procfs_example.c
+++ b/Documentation/DocBook/procfs_example.c
@@ -117,9 +117,6 @@ static int __init init_procfs_example(void)
                 rv = -ENOMEM;
                 goto out;
         }
-        
-        example_dir->owner = THIS_MODULE;
-        
         /* create jiffies using convenience function */
         jiffies_file = create_proc_read_entry("jiffies", 
                                               0444, example_dir, 
@@ -130,8 +127,6 @@ static int __init init_procfs_example(void)
                 goto no_jiffies;
         }
 
-        jiffies_file->owner = THIS_MODULE;
-
         /* create foo and bar files using same callback
          * functions 
          */
@@ -146,7 +141,6 @@ static int __init init_procfs_example(void)
         foo_file->data = &foo_data;
         foo_file->read_proc = proc_read_foobar;
         foo_file->write_proc = proc_write_foobar;
-        foo_file->owner = THIS_MODULE;
                 
         bar_file = create_proc_entry("bar", 0644, example_dir);
         if(bar_file == NULL) {
@@ -159,7 +153,6 @@ static int __init init_procfs_example(void)
         bar_file->data = &bar_data;
         bar_file->read_proc = proc_read_foobar;
         bar_file->write_proc = proc_write_foobar;
-        bar_file->owner = THIS_MODULE;
                 
         /* create symlink */
         symlink = proc_symlink("jiffies_too", example_dir, 
@@ -169,8 +162,6 @@ static int __init init_procfs_example(void)
                 goto no_symlink;
         }
 
-        symlink->owner = THIS_MODULE;
-
         /* everything OK */
         printk(KERN_INFO "%s %s initialised\n",
                MODULE_NAME, MODULE_VERS);