Commit 20b4fb48 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull VFS updates from Al Viro,

Misc cleanups all over the place, mainly wrt /proc interfaces (switch
create_proc_entry to proc_create(), get rid of the deprecated
create_proc_read_entry() in favor of using proc_create_data() and
seq_file etc).

7kloc removed.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (204 commits)
  don't bother with deferred freeing of fdtables
  proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
  proc: Make the PROC_I() and PDE() macros internal to procfs
  proc: Supply a function to remove a proc entry by PDE
  take cgroup_open() and cpuset_open() to fs/proc/base.c
  ppc: Clean up scanlog
  ppc: Clean up rtas_flash driver somewhat
  hostap: proc: Use remove_proc_subtree()
  drm: proc: Use remove_proc_subtree()
  drm: proc: Use minor->index to label things, not PDE->name
  drm: Constify drm_proc_list[]
  zoran: Don't print proc_dir_entry data in debug
  reiserfs: Don't access the proc_dir_entry in r_open(), r_start() r_show()
  proc: Supply an accessor for getting the data from a PDE's parent
  airo: Use remove_proc_subtree()
  rtl8192u: Don't need to save device proc dir PDE
  rtl8187se: Use a dir under /proc/net/r8180/
  proc: Add proc_mkdir_data()
  proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h}
  proc: Move PDE_NET() to fs/proc/proc_net.c
  ...
parents b9394d8a ac3e3c5b

arch/alpha/kernel/srm_env.c

+14 −79
Original line number Diff line number Diff line
@@ -51,13 +51,11 @@ MODULE_LICENSE("GPL"); 
typedef struct _srm_env {

	char			*name;

	unsigned long		id;

	struct proc_dir_entry	*proc_entry;

} srm_env_t;



static struct proc_dir_entry	*base_dir;

static struct proc_dir_entry	*named_dir;

static struct proc_dir_entry	*numbered_dir;

static char			number[256][4];



static srm_env_t	srm_named_entries[] = {

	{ "auto_action",	ENV_AUTO_ACTION		},
@@ -77,21 +75,18 @@ static srm_env_t srm_named_entries[] = { 
	{ "tty_dev",		ENV_TTY_DEV		},

	{ NULL,			0			},

};

static srm_env_t	srm_numbered_entries[256];





static int srm_env_proc_show(struct seq_file *m, void *v)

{

	unsigned long	ret;

	srm_env_t	*entry;

	unsigned long	id = (unsigned long)m->private;

	char		*page;



	entry = m->private;

	page = (char *)__get_free_page(GFP_USER);

	if (!page)

		return -ENOMEM;



	ret = callback_getenv(entry->id, page, PAGE_SIZE);

	ret = callback_getenv(id, page, PAGE_SIZE);



	if ((ret >> 61) == 0) {

		seq_write(m, page, ret);
@@ -104,14 +99,14 @@ static int srm_env_proc_show(struct seq_file *m, void *v) 


static int srm_env_proc_open(struct inode *inode, struct file *file)

{

	return single_open(file, srm_env_proc_show, PDE(inode)->data);

	return single_open(file, srm_env_proc_show, PDE_DATA(inode));

}



static ssize_t srm_env_proc_write(struct file *file, const char __user *buffer,

				  size_t count, loff_t *pos)

{

	int res;

	srm_env_t	*entry = PDE(file_inode(file))->data;

	unsigned long	id = (unsigned long)PDE_DATA(file_inode(file));

	char		*buf = (char *) __get_free_page(GFP_USER);

	unsigned long	ret1, ret2;
@@ -127,7 +122,7 @@ static ssize_t srm_env_proc_write(struct file *file, const char __user *buffer, 
		goto out;

	buf[count] = '\0';



	ret1 = callback_setenv(entry->id, buf, count);

	ret1 = callback_setenv(id, buf, count);

	if ((ret1 >> 61) == 0) {

		do

			ret2 = callback_save_env();
@@ -149,52 +144,6 @@ static const struct file_operations srm_env_proc_fops = { 
	.write		= srm_env_proc_write,

};



static void

srm_env_cleanup(void)

{

	srm_env_t	*entry;

	unsigned long	var_num;



	if (base_dir) {

		/*

		 * Remove named entries

		 */

		if (named_dir) {

			entry = srm_named_entries;

			while (entry->name != NULL && entry->id != 0) {

				if (entry->proc_entry) {

					remove_proc_entry(entry->name,

							named_dir);

					entry->proc_entry = NULL;

				}

				entry++;

			}

			remove_proc_entry(NAMED_DIR, base_dir);

		}



		/*

		 * Remove numbered entries

		 */

		if (numbered_dir) {

			for (var_num = 0; var_num <= 255; var_num++) {

				entry =	&srm_numbered_entries[var_num];



				if (entry->proc_entry) {

					remove_proc_entry(entry->name,

							numbered_dir);

					entry->proc_entry	= NULL;

					entry->name		= NULL;

				}

			}

			remove_proc_entry(NUMBERED_DIR, base_dir);

		}



		remove_proc_entry(BASE_DIR, NULL);

	}



	return;

}



static int __init

srm_env_init(void)

{
@@ -212,12 +161,6 @@ srm_env_init(void) 
		return -ENODEV;

	}



	/*

	 * Init numbers

	 */

	for (var_num = 0; var_num <= 255; var_num++)

		sprintf(number[var_num], "%ld", var_num);



	/*

	 * Create base directory

	 */
@@ -225,7 +168,7 @@ srm_env_init(void) 
	if (!base_dir) {

		printk(KERN_ERR "Couldn't create base dir /proc/%s\n",

				BASE_DIR);

		goto cleanup;

		return -ENOMEM;

	}



	/*
@@ -254,9 +197,8 @@ srm_env_init(void) 
	 */

	entry = srm_named_entries;

	while (entry->name && entry->id) {

		entry->proc_entry = proc_create_data(entry->name, 0644, named_dir,

						     &srm_env_proc_fops, entry);

		if (!entry->proc_entry)

		if (!proc_create_data(entry->name, 0644, named_dir,

			     &srm_env_proc_fops, (void *)entry->id))

			goto cleanup;

		entry++;

	}
@@ -265,15 +207,11 @@ srm_env_init(void) 
	 * Create all numbered nodes

	 */

	for (var_num = 0; var_num <= 255; var_num++) {

		entry = &srm_numbered_entries[var_num];

		entry->name = number[var_num];



		entry->proc_entry = proc_create_data(entry->name, 0644, numbered_dir,

						     &srm_env_proc_fops, entry);

		if (!entry->proc_entry)

		char name[4];

		sprintf(name, "%ld", var_num);

		if (!proc_create_data(name, 0644, numbered_dir,

			     &srm_env_proc_fops, (void *)var_num))

			goto cleanup;



		entry->id			= var_num;

	}



	printk(KERN_INFO "%s: version %s loaded successfully\n", NAME,
@@ -282,18 +220,15 @@ srm_env_init(void) 
	return 0;



cleanup:

	srm_env_cleanup();



	remove_proc_subtree(BASE_DIR, NULL);

	return -ENOMEM;

}



static void __exit

srm_env_exit(void)

{

	srm_env_cleanup();

	remove_proc_subtree(BASE_DIR, NULL);

	printk(KERN_INFO "%s: unloaded successfully\n", NAME);



	return;

}



module_init(srm_env_init);

arch/arm/kernel/atags_proc.c

+10 −18
Original line number Diff line number Diff line
@@ -9,23 +9,17 @@ struct buffer { 
	char data[];

};



static int

read_buffer(char* page, char** start, off_t off, int count,

	int* eof, void* data)

static ssize_t atags_read(struct file *file, char __user *buf,

			  size_t count, loff_t *ppos)

{

	struct buffer *buffer = (struct buffer *)data;



	if (off >= buffer->size) {

		*eof = 1;

		return 0;

	struct buffer *b = PDE_DATA(file_inode(file));

	return simple_read_from_buffer(buf, count, ppos, b->data, b->size);

}



	count = min((int) (buffer->size - off), count);



	memcpy(page, &buffer->data[off], count);



	return count;

}

static const struct file_operations atags_fops = {

	.read = atags_read,

	.llseek = default_llseek,

};



#define BOOT_PARAMS_SIZE 1536

static char __initdata atags_copy[BOOT_PARAMS_SIZE];
@@ -66,9 +60,7 @@ static int __init init_atags_procfs(void) 
	b->size = size;

	memcpy(b->data, atags_copy, size);



	tags_entry = create_proc_read_entry("atags", 0400,

			NULL, read_buffer, b);



	tags_entry = proc_create_data("atags", 0400, NULL, &atags_fops, b);

	if (!tags_entry)

		goto nomem;

arch/arm/kernel/swp_emulate.c

+19 −24
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#include <linux/sched.h>

#include <linux/syscalls.h>

#include <linux/perf_event.h>
@@ -79,27 +80,27 @@ static unsigned long abtcounter; 
static pid_t         previous_pid;



#ifdef CONFIG_PROC_FS

static int proc_read_status(char *page, char **start, off_t off, int count,

			    int *eof, void *data)

static int proc_status_show(struct seq_file *m, void *v)

{

	char *p = page;

	int len;



	p += sprintf(p, "Emulated SWP:\t\t%lu\n", swpcounter);

	p += sprintf(p, "Emulated SWPB:\t\t%lu\n", swpbcounter);

	p += sprintf(p, "Aborted SWP{B}:\t\t%lu\n", abtcounter);

	seq_printf(m, "Emulated SWP:\t\t%lu\n", swpcounter);

	seq_printf(m, "Emulated SWPB:\t\t%lu\n", swpbcounter);

	seq_printf(m, "Aborted SWP{B}:\t\t%lu\n", abtcounter);

	if (previous_pid != 0)

		p += sprintf(p, "Last process:\t\t%d\n", previous_pid);



	len = (p - page) - off;

	if (len < 0)

		len = 0;



	*eof = (len <= count) ? 1 : 0;

	*start = page + off;

		seq_printf(m, "Last process:\t\t%d\n", previous_pid);

	return 0;

}



	return len;

static int proc_status_open(struct inode *inode, struct file *file)

{

	return single_open(file, proc_status_show, PDE_DATA(inode));

}



static const struct file_operations proc_status_fops = {

	.open		= proc_status_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release,

};

#endif



/*
@@ -266,14 +267,8 @@ static struct undef_hook swp_hook = { 
static int __init swp_emulation_init(void)

{

#ifdef CONFIG_PROC_FS

	struct proc_dir_entry *res;



	res = create_proc_entry("cpu/swp_emulation", S_IRUGO, NULL);



	if (!res)

	if (!proc_create("cpu/swp_emulation", S_IRUGO, NULL, &proc_status_fops))

		return -ENOMEM;



	res->read_proc = proc_read_status;

#endif /* CONFIG_PROC_FS */



	printk(KERN_NOTICE "Registering SWP/SWPB emulation handler\n");

arch/arm/mach-msm/last_radio_log.c

+4 −16
Original line number Diff line number Diff line
@@ -31,20 +31,8 @@ extern void *smem_item(unsigned id, unsigned *size); 
static ssize_t last_radio_log_read(struct file *file, char __user *buf,

			size_t len, loff_t *offset)

{

	loff_t pos = *offset;

	ssize_t count;



	if (pos >= radio_log_size)

		return 0;



	count = min(len, (size_t)(radio_log_size - pos));

	if (copy_to_user(buf, radio_log_base + pos, count)) {

		pr_err("%s: copy to user failed\n", __func__);

		return -EFAULT;

	}



	*offset += count;

	return count;

	return simple_read_from_buffer(buf, len, offset,

				radio_log_base, radio_log_size);

}



static struct file_operations last_radio_log_fops = {
@@ -67,7 +55,8 @@ void msm_init_last_radio_log(struct module *owner) 
		return;

	}



	entry = create_proc_entry("last_radio_log", S_IFREG | S_IRUGO, NULL);

	entry = proc_create("last_radio_log", S_IRUGO, NULL,

				&last_radio_log_fops);

	if (!entry) {

		pr_err("%s: could not create proc entry for radio log\n",

				__func__);
@@ -77,7 +66,6 @@ void msm_init_last_radio_log(struct module *owner) 
	pr_err("%s: last radio log is %d bytes long\n", __func__,

		radio_log_size);

	last_radio_log_fops.owner = owner;

	entry->proc_fops = &last_radio_log_fops;

	entry->size = radio_log_size;

}

EXPORT_SYMBOL(msm_init_last_radio_log);

arch/arm/mach-omap1/pm.c

+37 −41
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ 


#include <linux/suspend.h>

#include <linux/sched.h>

#include <linux/proc_fs.h>

#include <linux/debugfs.h>

#include <linux/seq_file.h>

#include <linux/interrupt.h>

#include <linux/sysfs.h>

#include <linux/module.h>
@@ -423,23 +424,12 @@ void omap1_pm_suspend(void) 
		omap_rev());

}



#if defined(DEBUG) && defined(CONFIG_PROC_FS)

static int g_read_completed;



#ifdef CONFIG_DEBUG_FS

/*

 * Read system PM registers for debugging

 */

static int omap_pm_read_proc(

	char *page_buffer,

	char **my_first_byte,

	off_t virtual_start,

	int length,

	int *eof,

	void *data)

static int omap_pm_debug_show(struct seq_file *m, void *v)

{

	int my_buffer_offset = 0;

	char * const my_base = page_buffer;



	ARM_SAVE(ARM_CKCTL);

	ARM_SAVE(ARM_IDLECT1);

	ARM_SAVE(ARM_IDLECT2);
@@ -480,10 +470,7 @@ static int omap_pm_read_proc( 
		MPUI1610_SAVE(EMIFS_CONFIG);

	}



	if (virtual_start == 0) {

		g_read_completed = 0;



		my_buffer_offset += sprintf(my_base + my_buffer_offset,

	seq_printf(m,

		   "ARM_CKCTL_REG:            0x%-8x     \n"

		   "ARM_IDLECT1_REG:          0x%-8x     \n"

		   "ARM_IDLECT2_REG:          0x%-8x     \n"
@@ -514,7 +501,7 @@ static int omap_pm_read_proc( 
		   ULPD_SHOW(ULPD_POWER_CTRL));



	if (cpu_is_omap7xx()) {

			my_buffer_offset += sprintf(my_base + my_buffer_offset,

		seq_printf(m,

			   "MPUI7XX_CTRL_REG	     0x%-8x \n"

			   "MPUI7XX_DSP_STATUS_REG:      0x%-8x \n"

			   "MPUI7XX_DSP_BOOT_CONFIG_REG: 0x%-8x \n"
@@ -528,7 +515,7 @@ static int omap_pm_read_proc( 
			   MPUI7XX_SHOW(EMIFF_SDRAM_CONFIG),

			   MPUI7XX_SHOW(EMIFS_CONFIG));

	} else if (cpu_is_omap15xx()) {

			my_buffer_offset += sprintf(my_base + my_buffer_offset,

		seq_printf(m,

			   "MPUI1510_CTRL_REG             0x%-8x \n"

			   "MPUI1510_DSP_STATUS_REG:      0x%-8x \n"

			   "MPUI1510_DSP_BOOT_CONFIG_REG: 0x%-8x \n"
@@ -542,7 +529,7 @@ static int omap_pm_read_proc( 
			   MPUI1510_SHOW(EMIFF_SDRAM_CONFIG),

			   MPUI1510_SHOW(EMIFS_CONFIG));

	} else if (cpu_is_omap16xx()) {

			my_buffer_offset += sprintf(my_base + my_buffer_offset,

		seq_printf(m,

			   "MPUI1610_CTRL_REG             0x%-8x \n"

			   "MPUI1610_DSP_STATUS_REG:      0x%-8x \n"

			   "MPUI1610_DSP_BOOT_CONFIG_REG: 0x%-8x \n"
@@ -557,26 +544,35 @@ static int omap_pm_read_proc( 
			   MPUI1610_SHOW(EMIFS_CONFIG));

	}



		g_read_completed++;

	} else if (g_read_completed >= 1) {

		 *eof = 1;

	return 0;

}

	g_read_completed++;



	*my_first_byte = page_buffer;

	return  my_buffer_offset;

static int omap_pm_debug_open(struct inode *inode, struct file *file)

{

	return single_open(file, omap_pm_debug_show,

				&inode->i_private);

}



static void omap_pm_init_proc(void)

static const struct file_operations omap_pm_debug_fops = {

	.open		= omap_pm_debug_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release,

};



static void omap_pm_init_debugfs(void)

{

	/* XXX Appears to leak memory */

	create_proc_read_entry("driver/omap_pm",

			       S_IWUSR | S_IRUGO, NULL,

			       omap_pm_read_proc, NULL);

	struct dentry *d;



	d = debugfs_create_dir("pm_debug", NULL);

	if (!d)

		return;



	(void) debugfs_create_file("omap_pm", S_IWUSR | S_IRUGO,

					d, NULL, &omap_pm_debug_fops);

}



#endif /* DEBUG && CONFIG_PROC_FS */

#endif /* CONFIG_DEBUG_FS */



/*

 *	omap_pm_prepare - Do preliminary suspend work.
@@ -701,8 +697,8 @@ static int __init omap_pm_init(void) 


	suspend_set_ops(&omap_pm_ops);



#if defined(DEBUG) && defined(CONFIG_PROC_FS)

	omap_pm_init_proc();

#ifdef CONFIG_DEBUG_FS

	omap_pm_init_debugfs();

#endif



#ifdef CONFIG_OMAP_32K_TIMER

CRA Git | Maintained and supported by SUSTech CRA and CCSE