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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  fs: take the ACL checks to common code
  bury posix_acl_..._masq() variants
  kill boilerplates around posix_acl_create_masq()
  generic_acl: no need to clone acl just to push it to set_cached_acl()
  kill boilerplate around posix_acl_chmod_masq()
  reiserfs: cache negative ACLs for v1 stat format
  xfs: cache negative ACLs if there is no attribute fork
  9p: do no return 0 from ->check_acl without actually checking
  vfs: move ACL cache lookup into generic code
  CIFS: Fix oops while mounting with prefixpath
  xfs: Fix wrong return value of xfs_file_aio_write
  fix devtmpfs race
  caam: don't pass bogus S_IFCHR to debugfs_create_...()
  get rid of create_proc_entry() abuses - proc_mkdir() is there for purpose
  asus-wmi: ->is_visible() can't return negative
  fix jffs2 ACLs on big-endian with 16bit mode_t
  9p: close ACL leaks
  ocfs2_init_acl(): fix a leak
  VFS : mount lock scalability for internal mounts

9 files changed, 24 insertions, 27 deletions

diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index 6d678c99512e..b89fffc1d777 100644
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -406,9 +406,10 @@ static int devtmpfsd(void *p)
                         requests = NULL;
                         spin_unlock(&req_lock);
                         while (req) {
+                                struct req *next = req->next;
                                 req->err = handle(req->name, req->mode, req->dev);
                                 complete(&req->done);
-                                req = req->next;
+                                req = next;
                         }
                         spin_lock(&req_lock);
                 }
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index fc2d9ed22470..73988bb7322a 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -166,52 +166,52 @@ static int caam_probe(struct platform_device *pdev)
         /* Controller-level - performance monitor counters */
         ctrlpriv->ctl_rq_dequeued =
                 debugfs_create_u64("rq_dequeued",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                    ctrlpriv->ctl, &perfmon->req_dequeued);
         ctrlpriv->ctl_ob_enc_req =
                 debugfs_create_u64("ob_rq_encrypted",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                    ctrlpriv->ctl, &perfmon->ob_enc_req);
         ctrlpriv->ctl_ib_dec_req =
                 debugfs_create_u64("ib_rq_decrypted",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                    ctrlpriv->ctl, &perfmon->ib_dec_req);
         ctrlpriv->ctl_ob_enc_bytes =
                 debugfs_create_u64("ob_bytes_encrypted",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                    ctrlpriv->ctl, &perfmon->ob_enc_bytes);
         ctrlpriv->ctl_ob_prot_bytes =
                 debugfs_create_u64("ob_bytes_protected",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                    ctrlpriv->ctl, &perfmon->ob_prot_bytes);
         ctrlpriv->ctl_ib_dec_bytes =
                 debugfs_create_u64("ib_bytes_decrypted",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                    ctrlpriv->ctl, &perfmon->ib_dec_bytes);
         ctrlpriv->ctl_ib_valid_bytes =
                 debugfs_create_u64("ib_bytes_validated",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                    ctrlpriv->ctl, &perfmon->ib_valid_bytes);
 
         /* Controller level - global status values */
         ctrlpriv->ctl_faultaddr =
                 debugfs_create_u64("fault_addr",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                    ctrlpriv->ctl, &perfmon->faultaddr);
         ctrlpriv->ctl_faultdetail =
                 debugfs_create_u32("fault_detail",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                    ctrlpriv->ctl, &perfmon->faultdetail);
         ctrlpriv->ctl_faultstatus =
                 debugfs_create_u32("fault_status",
-                                   S_IFCHR | S_IRUSR | S_IRGRP | S_IROTH,
+                                   S_IRUSR | S_IRGRP | S_IROTH,
                                    ctrlpriv->ctl, &perfmon->status);
 
         /* Internal covering keys (useful in non-secure mode only) */
         ctrlpriv->ctl_kek_wrap.data = &ctrlpriv->ctrl->kek[0];
         ctrlpriv->ctl_kek_wrap.size = KEK_KEY_SIZE * sizeof(u32);
         ctrlpriv->ctl_kek = debugfs_create_blob("kek",
-                                                S_IFCHR | S_IRUSR |
+                                                S_IRUSR |
                                                 S_IRGRP | S_IROTH,
                                                 ctrlpriv->ctl,
                                                 &ctrlpriv->ctl_kek_wrap);
@@ -219,7 +219,7 @@ static int caam_probe(struct platform_device *pdev)
         ctrlpriv->ctl_tkek_wrap.data = &ctrlpriv->ctrl->tkek[0];
         ctrlpriv->ctl_tkek_wrap.size = KEK_KEY_SIZE * sizeof(u32);
         ctrlpriv->ctl_tkek = debugfs_create_blob("tkek",
-                                                 S_IFCHR | S_IRUSR |
+                                                 S_IRUSR |
                                                  S_IRGRP | S_IROTH,
                                                  ctrlpriv->ctl,
                                                  &ctrlpriv->ctl_tkek_wrap);
@@ -227,7 +227,7 @@ static int caam_probe(struct platform_device *pdev)
         ctrlpriv->ctl_tdsk_wrap.data = &ctrlpriv->ctrl->tdsk[0];
         ctrlpriv->ctl_tdsk_wrap.size = KEK_KEY_SIZE * sizeof(u32);
         ctrlpriv->ctl_tdsk = debugfs_create_blob("tdsk",
-                                                 S_IFCHR | S_IRUSR |
+                                                 S_IRUSR |
                                                  S_IRGRP | S_IROTH,
                                                  ctrlpriv->ctl,
                                                  &ctrlpriv->ctl_tdsk_wrap);
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 3f92731a5b9e..f1af2228a1b1 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -1192,7 +1192,7 @@ err_unregister_chdev:
 static void __exit cleanup_mtdchar(void)
 {
         unregister_mtd_user(&mtdchar_notifier);
-        mntput(mtd_inode_mnt);
+        kern_unmount(mtd_inode_mnt);
         unregister_filesystem(&mtd_inodefs_type);
         __unregister_chrdev(MTD_CHAR_MAJOR, 0, 1 << MINORBITS, "mtd");
 }
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 3c7857c71a23..65b66aa44c78 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -857,7 +857,7 @@ static mode_t asus_hwmon_sysfs_is_visible(struct kobject *kobj,
                 int err = asus_wmi_get_devstate(asus, dev_id, &value);
 
                 if (err < 0)
-                        return err;
+                        return 0; /* can't return negative here */
         }
 
         if (dev_id == ASUS_WMI_DEVID_FAN_CTRL) {
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index bae7d85fe831..4c6651aac307 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -307,7 +307,7 @@ static int proc_get_stats_tx(char *page, char **start,
 void rtl8180_proc_module_init(void)
 {
         DMESG("Initializing proc filesystem");
-        rtl8180_proc = create_proc_entry(RTL8180_MODULE_NAME, S_IFDIR, init_net.proc_net);
+        rtl8180_proc = proc_mkdir(RTL8180_MODULE_NAME, init_net.proc_net);
 }
 
 void rtl8180_proc_module_remove(void)
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
index 663b0b8e1095..c2901b50dbfe 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
@@ -311,7 +311,7 @@ int __init ieee80211_rtl_init(void)
         }
 
         ieee80211_debug_level = debug;
-        ieee80211_proc = create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net);
+        ieee80211_proc = proc_mkdir(DRV_NAME, init_net.proc_net);
         if (ieee80211_proc == NULL) {
                 IEEE80211_ERROR("Unable to create " DRV_NAME
                                 " proc directory\n");
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 19a9a07224a2..8550794c6b91 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -508,7 +508,7 @@ static int proc_get_stats_rx(char *page, char **start,
 static void rtl8192_proc_module_init(void)
 {
         RT_TRACE(COMP_INIT, "Initializing proc filesystem\n");
-        rtl8192_proc=create_proc_entry(RTL819xE_MODULE_NAME, S_IFDIR, init_net.proc_net);
+        rtl8192_proc = proc_mkdir(RTL819xE_MODULE_NAME, init_net.proc_net);
 }
 
 
@@ -540,9 +540,7 @@ static void rtl8192_proc_init_one(struct r8192_priv *priv)
         struct net_device *dev = priv->ieee80211->dev;
         struct proc_dir_entry *e;
 
-        priv->dir_dev = create_proc_entry(dev->name,
-                                          S_IFDIR | S_IRUGO | S_IXUGO,
-                                          rtl8192_proc);
+        priv->dir_dev = proc_mkdir(dev->name, rtl8192_proc);
         if (!priv->dir_dev) {
                 RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192/%s\n",
                       dev->name);
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
index fe978f359f91..d315b256b7a7 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
@@ -283,7 +283,7 @@ int __init ieee80211_debug_init(void)
 
         ieee80211_debug_level = debug;
 
-        ieee80211_proc = create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net);
+        ieee80211_proc = proc_mkdir(DRV_NAME, init_net.proc_net);
         if (ieee80211_proc == NULL) {
                 IEEE80211_ERROR("Unable to create " DRV_NAME
                                 " proc directory\n");
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index e81b8ab6aa9d..6a1b5c179027 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -671,7 +671,7 @@ static int proc_get_stats_rx(char *page, char **start,
 void rtl8192_proc_module_init(void)
 {
         RT_TRACE(COMP_INIT, "Initializing proc filesystem");
-        rtl8192_proc=create_proc_entry(RTL819xU_MODULE_NAME, S_IFDIR, init_net.proc_net);
+        rtl8192_proc = proc_mkdir(RTL819xU_MODULE_NAME, init_net.proc_net);
 }
 
 
@@ -706,9 +706,7 @@ void rtl8192_proc_init_one(struct net_device *dev)
 {
         struct proc_dir_entry *e;
         struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
-        priv->dir_dev = create_proc_entry(dev->name,
-                                          S_IFDIR | S_IRUGO | S_IXUGO,
-                                          rtl8192_proc);
+        priv->dir_dev = proc_mkdir(dev->name, rtl8192_proc);
         if (!priv->dir_dev) {
                 RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192/%s\n",
                       dev->name);