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

3 files changed, 38 insertions, 40 deletions

diff --git a/net/wireless/lib80211_crypt_ccmp.c b/net/wireless/lib80211_crypt_ccmp.c
index 1526c211db66..dc0e59e53dbf 100644
--- a/net/wireless/lib80211_crypt_ccmp.c
+++ b/net/wireless/lib80211_crypt_ccmp.c
@@ -430,24 +430,23 @@ static int lib80211_ccmp_get_key(void *key, int len, u8 * seq, void *priv)
         return CCMP_TK_LEN;
 }
 
-static char *lib80211_ccmp_print_stats(char *p, void *priv)
+static void lib80211_ccmp_print_stats(struct seq_file *m, void *priv)
 {
         struct lib80211_ccmp_data *ccmp = priv;
 
-        p += sprintf(p, "key[%d] alg=CCMP key_set=%d "
-                     "tx_pn=%02x%02x%02x%02x%02x%02x "
-                     "rx_pn=%02x%02x%02x%02x%02x%02x "
-                     "format_errors=%d replays=%d decrypt_errors=%d\n",
-                     ccmp->key_idx, ccmp->key_set,
-                     ccmp->tx_pn[0], ccmp->tx_pn[1], ccmp->tx_pn[2],
-                     ccmp->tx_pn[3], ccmp->tx_pn[4], ccmp->tx_pn[5],
-                     ccmp->rx_pn[0], ccmp->rx_pn[1], ccmp->rx_pn[2],
-                     ccmp->rx_pn[3], ccmp->rx_pn[4], ccmp->rx_pn[5],
-                     ccmp->dot11RSNAStatsCCMPFormatErrors,
-                     ccmp->dot11RSNAStatsCCMPReplays,
-                     ccmp->dot11RSNAStatsCCMPDecryptErrors);
-
-        return p;
+        seq_printf(m,
+                   "key[%d] alg=CCMP key_set=%d "
+                   "tx_pn=%02x%02x%02x%02x%02x%02x "
+                   "rx_pn=%02x%02x%02x%02x%02x%02x "
+                   "format_errors=%d replays=%d decrypt_errors=%d\n",
+                   ccmp->key_idx, ccmp->key_set,
+                   ccmp->tx_pn[0], ccmp->tx_pn[1], ccmp->tx_pn[2],
+                   ccmp->tx_pn[3], ccmp->tx_pn[4], ccmp->tx_pn[5],
+                   ccmp->rx_pn[0], ccmp->rx_pn[1], ccmp->rx_pn[2],
+                   ccmp->rx_pn[3], ccmp->rx_pn[4], ccmp->rx_pn[5],
+                   ccmp->dot11RSNAStatsCCMPFormatErrors,
+                   ccmp->dot11RSNAStatsCCMPReplays,
+                   ccmp->dot11RSNAStatsCCMPDecryptErrors);
 }
 
 static struct lib80211_crypto_ops lib80211_crypt_ccmp = {
diff --git a/net/wireless/lib80211_crypt_tkip.c b/net/wireless/lib80211_crypt_tkip.c
index d475cfc8568f..8c90ba79e56e 100644
--- a/net/wireless/lib80211_crypt_tkip.c
+++ b/net/wireless/lib80211_crypt_tkip.c
@@ -703,30 +703,30 @@ static int lib80211_tkip_get_key(void *key, int len, u8 * seq, void *priv)
         return TKIP_KEY_LEN;
 }
 
-static char *lib80211_tkip_print_stats(char *p, void *priv)
+static void lib80211_tkip_print_stats(struct seq_file *m, void *priv)
 {
         struct lib80211_tkip_data *tkip = priv;
-        p += sprintf(p, "key[%d] alg=TKIP key_set=%d "
-                     "tx_pn=%02x%02x%02x%02x%02x%02x "
-                     "rx_pn=%02x%02x%02x%02x%02x%02x "
-                     "replays=%d icv_errors=%d local_mic_failures=%d\n",
-                     tkip->key_idx, tkip->key_set,
-                     (tkip->tx_iv32 >> 24) & 0xff,
-                     (tkip->tx_iv32 >> 16) & 0xff,
-                     (tkip->tx_iv32 >> 8) & 0xff,
-                     tkip->tx_iv32 & 0xff,
-                     (tkip->tx_iv16 >> 8) & 0xff,
-                     tkip->tx_iv16 & 0xff,
-                     (tkip->rx_iv32 >> 24) & 0xff,
-                     (tkip->rx_iv32 >> 16) & 0xff,
-                     (tkip->rx_iv32 >> 8) & 0xff,
-                     tkip->rx_iv32 & 0xff,
-                     (tkip->rx_iv16 >> 8) & 0xff,
-                     tkip->rx_iv16 & 0xff,
-                     tkip->dot11RSNAStatsTKIPReplays,
-                     tkip->dot11RSNAStatsTKIPICVErrors,
-                     tkip->dot11RSNAStatsTKIPLocalMICFailures);
-        return p;
+        seq_printf(m,
+                   "key[%d] alg=TKIP key_set=%d "
+                   "tx_pn=%02x%02x%02x%02x%02x%02x "
+                   "rx_pn=%02x%02x%02x%02x%02x%02x "
+                   "replays=%d icv_errors=%d local_mic_failures=%d\n",
+                   tkip->key_idx, tkip->key_set,
+                   (tkip->tx_iv32 >> 24) & 0xff,
+                   (tkip->tx_iv32 >> 16) & 0xff,
+                   (tkip->tx_iv32 >> 8) & 0xff,
+                   tkip->tx_iv32 & 0xff,
+                   (tkip->tx_iv16 >> 8) & 0xff,
+                   tkip->tx_iv16 & 0xff,
+                   (tkip->rx_iv32 >> 24) & 0xff,
+                   (tkip->rx_iv32 >> 16) & 0xff,
+                   (tkip->rx_iv32 >> 8) & 0xff,
+                   tkip->rx_iv32 & 0xff,
+                   (tkip->rx_iv16 >> 8) & 0xff,
+                   tkip->rx_iv16 & 0xff,
+                   tkip->dot11RSNAStatsTKIPReplays,
+                   tkip->dot11RSNAStatsTKIPICVErrors,
+                   tkip->dot11RSNAStatsTKIPLocalMICFailures);
 }
 
 static struct lib80211_crypto_ops lib80211_crypt_tkip = {
diff --git a/net/wireless/lib80211_crypt_wep.c b/net/wireless/lib80211_crypt_wep.c
index c1304018fc1c..1c292e4ea7b6 100644
--- a/net/wireless/lib80211_crypt_wep.c
+++ b/net/wireless/lib80211_crypt_wep.c
@@ -253,11 +253,10 @@ static int lib80211_wep_get_key(void *key, int len, u8 * seq, void *priv)
         return wep->key_len;
 }
 
-static char *lib80211_wep_print_stats(char *p, void *priv)
+static void lib80211_wep_print_stats(struct seq_file *m, void *priv)
 {
         struct lib80211_wep_data *wep = priv;
-        p += sprintf(p, "key[%d] alg=WEP len=%d\n", wep->key_idx, wep->key_len);
-        return p;
+        seq_printf(m, "key[%d] alg=WEP len=%d\n", wep->key_idx, wep->key_len);
 }
 
 static struct lib80211_crypto_ops lib80211_crypt_wep = {