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
  ...

4 files changed, 70 insertions, 99 deletions

diff --git a/arch/arm/kernel/atags_proc.c b/arch/arm/kernel/atags_proc.c
index 42a1a1415fa6..c7ff8073416f 100644
--- a/arch/arm/kernel/atags_proc.c
+++ b/arch/arm/kernel/atags_proc.c
@@ -9,24 +9,18 @@ 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;
-        }
-
-        count = min((int) (buffer->size - off), count);
-
-        memcpy(page, &buffer->data[off], count);
-
-        return count;
+        struct buffer *b = PDE_DATA(file_inode(file));
+        return simple_read_from_buffer(buf, count, ppos, b->data, b->size);
 }
 
+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;
 
diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c
index ab1017bd1667..087fc321e9e5 100644
--- a/arch/arm/kernel/swp_emulate.c
+++ b/arch/arm/kernel/swp_emulate.c
@@ -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");
diff --git a/arch/arm/mach-msm/last_radio_log.c b/arch/arm/mach-msm/last_radio_log.c
index 1e243f46a969..7777767ee89a 100644
--- a/arch/arm/mach-msm/last_radio_log.c
+++ b/arch/arm/mach-msm/last_radio_log.c
@@ -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);
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index db37f49da5ac..dd712f109738 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -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"
@@ -513,8 +500,8 @@ static int omap_pm_read_proc(
                    ULPD_SHOW(ULPD_STATUS_REQ),
                    ULPD_SHOW(ULPD_POWER_CTRL));
 
-                if (cpu_is_omap7xx()) {
-                        my_buffer_offset += sprintf(my_base + my_buffer_offset,
+        if (cpu_is_omap7xx()) {
+                seq_printf(m,
                            "MPUI7XX_CTRL_REG         0x%-8x \n"
                            "MPUI7XX_DSP_STATUS_REG:      0x%-8x \n"
                            "MPUI7XX_DSP_BOOT_CONFIG_REG: 0x%-8x \n"
@@ -527,8 +514,8 @@ static int omap_pm_read_proc(
                            MPUI7XX_SHOW(MPUI_DSP_API_CONFIG),
                            MPUI7XX_SHOW(EMIFF_SDRAM_CONFIG),
                            MPUI7XX_SHOW(EMIFS_CONFIG));
-                } else if (cpu_is_omap15xx()) {
-                        my_buffer_offset += sprintf(my_base + my_buffer_offset,
+        } else if (cpu_is_omap15xx()) {
+                seq_printf(m,
                            "MPUI1510_CTRL_REG             0x%-8x \n"
                            "MPUI1510_DSP_STATUS_REG:      0x%-8x \n"
                            "MPUI1510_DSP_BOOT_CONFIG_REG: 0x%-8x \n"
@@ -541,8 +528,8 @@ static int omap_pm_read_proc(
                            MPUI1510_SHOW(MPUI_DSP_API_CONFIG),
                            MPUI1510_SHOW(EMIFF_SDRAM_CONFIG),
                            MPUI1510_SHOW(EMIFS_CONFIG));
-                } else if (cpu_is_omap16xx()) {
-                        my_buffer_offset += sprintf(my_base + my_buffer_offset,
+        } else if (cpu_is_omap16xx()) {
+                seq_printf(m,
                            "MPUI1610_CTRL_REG             0x%-8x \n"
                            "MPUI1610_DSP_STATUS_REG:      0x%-8x \n"
                            "MPUI1610_DSP_BOOT_CONFIG_REG: 0x%-8x \n"
@@ -555,28 +542,37 @@ static int omap_pm_read_proc(
                            MPUI1610_SHOW(MPUI_DSP_API_CONFIG),
                            MPUI1610_SHOW(EMIFF_SDRAM_CONFIG),
                            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;
+        return 0;
+}
+
+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