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

1 files changed, 14 insertions, 28 deletions

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 4faa982807f2..92b05d95ec5e 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -437,22 +437,21 @@ void usb_stor_report_bus_reset(struct us_data *us)
  * /proc/scsi/ functions
  ***********************************************************************/
 
+static int write_info(struct Scsi_Host *host, char *buffer, int length)
+{
+        /* if someone is sending us data, just throw it away */
+        return length;
+}
+
 /* we use this macro to help us write into the buffer */
 #undef SPRINTF
-#define SPRINTF(args...) \
-        do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0)
+#define SPRINTF(args...) seq_printf(m, ## args)
 
-static int proc_info (struct Scsi_Host *host, char *buffer,
-                char **start, off_t offset, int length, int inout)
+static int show_info (struct seq_file *m, struct Scsi_Host *host)
 {
         struct us_data *us = host_to_us(host);
-        char *pos = buffer;
         const char *string;
 
-        /* if someone is sending us data, just throw it away */
-        if (inout)
-                return length;
-
         /* print the controller name */
         SPRINTF("   Host scsi%d: usb-storage\n", host->host_no);
 
@@ -482,28 +481,14 @@ static int proc_info (struct Scsi_Host *host, char *buffer,
         SPRINTF("    Transport: %s\n", us->transport_name);
 
         /* show the device flags */
-        if (pos < buffer + length) {
-                pos += sprintf(pos, "       Quirks:");
+        SPRINTF("       Quirks:");
 
 #define US_FLAG(name, value) \
-        if (us->fflags & value) pos += sprintf(pos, " " #name);
+        if (us->fflags & value) seq_printf(m, " " #name);
 US_DO_ALL_FLAGS
 #undef US_FLAG
-
-                *(pos++) = '\n';
-        }
-
-        /*
-         * Calculate start of next buffer, and return value.
-         */
-        *start = buffer + offset;
-
-        if ((pos - buffer) < offset)
-                return (0);
-        else if ((pos - buffer - offset) < length)
-                return (pos - buffer - offset);
-        else
-                return (length);
+        seq_putc(m, '\n');
+        return 0;
 }
 
 /***********************************************************************
@@ -548,7 +533,8 @@ struct scsi_host_template usb_stor_host_template = {
         /* basic userland interface stuff */
         .name =                         "usb-storage",
         .proc_name =                    "usb-storage",
-        .proc_info =                    proc_info,
+        .show_info =                    show_info,
+        .write_info =                   write_info,
         .info =                         host_info,
 
         /* command interface -- queued only */