Merge branch 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull procfs updates from Al Viro:
 "Christoph's proc_create_... cleanups series"

* 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (44 commits)
  xfs, proc: hide unused xfs procfs helpers
  isdn/gigaset: add back gigaset_procinfo assignment
  proc: update SIZEOF_PDE_INLINE_NAME for the new pde fields
  tty: replace ->proc_fops with ->proc_show
  ide: replace ->proc_fops with ->proc_show
  ide: remove ide_driver_proc_write
  isdn: replace ->proc_fops with ->proc_show
  atm: switch to proc_create_seq_private
  atm: simplify procfs code
  bluetooth: switch to proc_create_seq_data
  netfilter/x_tables: switch to proc_create_seq_private
  netfilter/xt_hashlimit: switch to proc_create_{seq,single}_data
  neigh: switch to proc_create_seq_data
  hostap: switch to proc_create_{seq,single}_data
  bonding: switch to proc_create_seq_data
  rtc/proc: switch to proc_create_single_data
  drbd: switch to proc_create_single
  resource: switch to proc_create_seq_data
  staging/rtl8192u: simplify procfs code
  jfs: simplify procfs code
  ...

diff --cc block/genhd.c
Simple merge

diff --cc drivers/block/DAC960.c
index 7c3887a7e534737b860633d67076517fc7fe191c,6918c3d9482e3279f733c60db8031a78c3696465..6ca77d6047d619dd54ea5ef464af625d1712db8f
--- 1/drivers/block/DAC960.c
--- 2/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@@ -6587,9 -6553,11 +6548,11 @@@ static void DAC960_CreateProcEntries(DA
                 "c%d", Controller->ControllerNumber);
        ControllerProcEntry = proc_mkdir(Controller->ControllerName,
                                         DAC960_ProcDirectoryEntry);
-       proc_create_data("initial_status", 0, ControllerProcEntry, &dac960_initial_status_proc_fops, Controller);
-       proc_create_data("current_status", 0, ControllerProcEntry, &dac960_current_status_proc_fops, Controller);
+       proc_create_single_data("initial_status", 0, ControllerProcEntry,
+                       dac960_initial_status_proc_show, Controller);
+       proc_create_single_data("current_status", 0, ControllerProcEntry,
+                       dac960_current_status_proc_show, Controller);
 -      proc_create_data("user_command", S_IWUSR | S_IRUSR, ControllerProcEntry, &dac960_user_command_proc_fops, Controller);
 +      proc_create_data("user_command", 0600, ControllerProcEntry, &dac960_user_command_proc_fops, Controller);
        Controller->ControllerProcEntry = ControllerProcEntry;
  }
  

diff --cc drivers/block/drbd/drbd_int.h
Simple merge

diff --cc drivers/block/drbd/drbd_main.c
index a233e71e58ff1794f89801c0a422536840ba955c,c2d154faac02a1756d4ea8b67b88c8373d0f51fe..7655d6133139961a26e02df3de444a7950683436
--- 1/drivers/block/drbd/drbd_main.c
--- 2/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@@ -2989,7 -3010,8 +2989,7 @@@ static int __init drbd_init(void
                goto fail;
  
        err = -ENOMEM;
-       drbd_proc = proc_create_data("drbd", S_IFREG | 0444 , NULL, &drbd_proc_fops, NULL);
 -      drbd_proc = proc_create_single("drbd", S_IFREG | S_IRUGO , NULL,
 -                      drbd_seq_show);
++      drbd_proc = proc_create_single("drbd", S_IFREG | 0444 , NULL, drbd_seq_show);
        if (!drbd_proc) {
                pr_err("unable to register proc file\n");
                goto fail;

diff --cc drivers/block/pktcdvd.c
Simple merge

diff --cc drivers/ide/ide-cd.c
Simple merge

diff --cc drivers/ide/ide-tape.c
Simple merge

diff --cc drivers/parisc/ccio-dma.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc fs/proc/array.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_conn.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

diff --cc net/netfilter/x_tables.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge