Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf2f7d7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 53d8f670 a9caa3de

Documentation/DocBook/procfs_example.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -117,9 +117,6 @@ static int __init init_procfs_example(void) 
		rv = -ENOMEM;

		rv = -ENOMEM;

		goto out;

		goto out;

	}

	}

	

	example_dir->owner = THIS_MODULE;

	

	/* create jiffies using convenience function */

	/* create jiffies using convenience function */

	jiffies_file = create_proc_read_entry("jiffies", 

	jiffies_file = create_proc_read_entry("jiffies", 

					      0444, example_dir, 

					      0444, example_dir,
@@ -130,8 +127,6 @@ static int __init init_procfs_example(void) 
		goto no_jiffies;

		goto no_jiffies;

	}

	}





	jiffies_file->owner = THIS_MODULE;



	/* create foo and bar files using same callback

	/* create foo and bar files using same callback

	 * functions 

	 * functions 

	 */

	 */
@@ -146,7 +141,6 @@ static int __init init_procfs_example(void) 
	foo_file->data = &foo_data;

	foo_file->data = &foo_data;

	foo_file->read_proc = proc_read_foobar;

	foo_file->read_proc = proc_read_foobar;

	foo_file->write_proc = proc_write_foobar;

	foo_file->write_proc = proc_write_foobar;

	foo_file->owner = THIS_MODULE;

		

		

	bar_file = create_proc_entry("bar", 0644, example_dir);

	bar_file = create_proc_entry("bar", 0644, example_dir);

	if(bar_file == NULL) {

	if(bar_file == NULL) {
@@ -159,7 +153,6 @@ static int __init init_procfs_example(void) 
	bar_file->data = &bar_data;

	bar_file->data = &bar_data;

	bar_file->read_proc = proc_read_foobar;

	bar_file->read_proc = proc_read_foobar;

	bar_file->write_proc = proc_write_foobar;

	bar_file->write_proc = proc_write_foobar;

	bar_file->owner = THIS_MODULE;

		

		

	/* create symlink */

	/* create symlink */

	symlink = proc_symlink("jiffies_too", example_dir, 

	symlink = proc_symlink("jiffies_too", example_dir,
@@ -169,8 +162,6 @@ static int __init init_procfs_example(void) 
		goto no_symlink;

		goto no_symlink;

	}

	}





	symlink->owner = THIS_MODULE;



	/* everything OK */

	/* everything OK */

	printk(KERN_INFO "%s %s initialised\n",

	printk(KERN_INFO "%s %s initialised\n",

	       MODULE_NAME, MODULE_VERS);

	       MODULE_NAME, MODULE_VERS);

arch/alpha/kernel/srm_env.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -218,7 +218,6 @@ srm_env_init(void) 
				BASE_DIR);

				BASE_DIR);

		goto cleanup;

		goto cleanup;

	}

	}

	base_dir->owner = THIS_MODULE;





	/*

	/*

	 * Create per-name subdirectory

	 * Create per-name subdirectory
@@ -229,7 +228,6 @@ srm_env_init(void) 
				BASE_DIR, NAMED_DIR);

				BASE_DIR, NAMED_DIR);

		goto cleanup;

		goto cleanup;

	}

	}

	named_dir->owner = THIS_MODULE;





	/*

	/*

	 * Create per-number subdirectory

	 * Create per-number subdirectory
@@ -241,7 +239,6 @@ srm_env_init(void) 
		goto cleanup;

		goto cleanup;





	}

	}

	numbered_dir->owner = THIS_MODULE;





	/*

	/*

	 * Create all named nodes

	 * Create all named nodes
@@ -254,7 +251,6 @@ srm_env_init(void) 
			goto cleanup;

			goto cleanup;





		entry->proc_entry->data		= (void *) entry;

		entry->proc_entry->data		= (void *) entry;

		entry->proc_entry->owner	= THIS_MODULE;

		entry->proc_entry->read_proc	= srm_env_read;

		entry->proc_entry->read_proc	= srm_env_read;

		entry->proc_entry->write_proc	= srm_env_write;

		entry->proc_entry->write_proc	= srm_env_write;
@@ -275,7 +271,6 @@ srm_env_init(void) 




		entry->id			= var_num;

		entry->id			= var_num;

		entry->proc_entry->data		= (void *) entry;

		entry->proc_entry->data		= (void *) entry;

		entry->proc_entry->owner	= THIS_MODULE;

		entry->proc_entry->read_proc	= srm_env_read;

		entry->proc_entry->read_proc	= srm_env_read;

		entry->proc_entry->write_proc	= srm_env_write;

		entry->proc_entry->write_proc	= srm_env_write;

	}

	}

arch/blackfin/mm/sram-alloc.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -854,7 +854,6 @@ static int __init sram_proc_init(void) 
		printk(KERN_WARNING "unable to create /proc/sram\n");

		printk(KERN_WARNING "unable to create /proc/sram\n");

		return -1;

		return -1;

	}

	}

	ptr->owner = THIS_MODULE;

	ptr->read_proc = sram_proc_read;

	ptr->read_proc = sram_proc_read;

	return 0;

	return 0;

}

}

arch/ia64/kernel/palinfo.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1002,8 +1002,6 @@ create_palinfo_proc_entries(unsigned int cpu) 
		*pdir = create_proc_read_entry(

		*pdir = create_proc_read_entry(

				palinfo_entries[j].name, 0, cpu_dir,

				palinfo_entries[j].name, 0, cpu_dir,

				palinfo_read_entry, (void *)f.value);

				palinfo_read_entry, (void *)f.value);

		if (*pdir)

			(*pdir)->owner = THIS_MODULE;

		pdir++;

		pdir++;

	}

	}

}

}

arch/ia64/sn/kernel/sn2/prominfo_proc.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -225,7 +225,6 @@ static struct proc_dir_entry *sgi_prominfo_entry; 
int __init prominfo_init(void)

int __init prominfo_init(void)

{

{

	struct proc_dir_entry **entp;

	struct proc_dir_entry **entp;

	struct proc_dir_entry *p;

	cnodeid_t cnodeid;

	cnodeid_t cnodeid;

	unsigned long nasid;

	unsigned long nasid;

	int size;

	int size;
@@ -246,14 +245,10 @@ int __init prominfo_init(void) 
		sprintf(name, "node%d", cnodeid);

		sprintf(name, "node%d", cnodeid);

		*entp = proc_mkdir(name, sgi_prominfo_entry);

		*entp = proc_mkdir(name, sgi_prominfo_entry);

		nasid = cnodeid_to_nasid(cnodeid);

		nasid = cnodeid_to_nasid(cnodeid);

		p = create_proc_read_entry("fit", 0, *entp, read_fit_entry,

		create_proc_read_entry("fit", 0, *entp, read_fit_entry,

					   (void *)nasid);

					   (void *)nasid);

		if (p)

		create_proc_read_entry("version", 0, *entp,

			p->owner = THIS_MODULE;

		p = create_proc_read_entry("version", 0, *entp,

					   read_version_entry, (void *)nasid);

					   read_version_entry, (void *)nasid);

		if (p)

			p->owner = THIS_MODULE;

		entp++;

		entp++;

	}

	}