4 files changed, 69 insertions, 72 deletions

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 541ead4d8965..85b8517f17a0 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -386,9 +386,7 @@ void ceph_put_mds_session(struct ceph_mds_session *s)
              atomic_read(&s->s_ref), atomic_read(&s->s_ref)-1);
         if (atomic_dec_and_test(&s->s_ref)) {
                 if (s->s_auth.authorizer)
-                        ceph_auth_destroy_authorizer(
-                                s->s_mdsc->fsc->client->monc.auth,
-                                s->s_auth.authorizer);
+                        ceph_auth_destroy_authorizer(s->s_auth.authorizer);
                 kfree(s);
         }
 }
@@ -3900,7 +3898,7 @@ static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,
         struct ceph_auth_handshake *auth = &s->s_auth;
 
         if (force_new && auth->authorizer) {
-                ceph_auth_destroy_authorizer(ac, auth->authorizer);
+                ceph_auth_destroy_authorizer(auth->authorizer);
                 auth->authorizer = NULL;
         }
         if (!auth->authorizer) {
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 655f21f99160..0b2954d7172d 100644
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -128,6 +128,7 @@ static const match_table_t tokens = {
 struct pts_fs_info {
         struct ida allocated_ptys;
         struct pts_mount_opts mount_opts;
+        struct super_block *sb;
         struct dentry *ptmx_dentry;
 };
 
@@ -358,7 +359,7 @@ static const struct super_operations devpts_sops = {
         .show_options   = devpts_show_options,
 };
 
-static void *new_pts_fs_info(void)
+static void *new_pts_fs_info(struct super_block *sb)
 {
         struct pts_fs_info *fsi;
 
@@ -369,6 +370,7 @@ static void *new_pts_fs_info(void)
         ida_init(&fsi->allocated_ptys);
         fsi->mount_opts.mode = DEVPTS_DEFAULT_MODE;
         fsi->mount_opts.ptmxmode = DEVPTS_DEFAULT_PTMX_MODE;
+        fsi->sb = sb;
 
         return fsi;
 }
@@ -384,7 +386,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
         s->s_op = &devpts_sops;
         s->s_time_gran = 1;
 
-        s->s_fs_info = new_pts_fs_info();
+        s->s_fs_info = new_pts_fs_info(s);
         if (!s->s_fs_info)
                 goto fail;
 
@@ -524,17 +526,14 @@ static struct file_system_type devpts_fs_type = {
  * to the System V naming convention
  */
 
-int devpts_new_index(struct inode *ptmx_inode)
+int devpts_new_index(struct pts_fs_info *fsi)
 {
-        struct super_block *sb = pts_sb_from_inode(ptmx_inode);
-        struct pts_fs_info *fsi;
         int index;
         int ida_ret;
 
-        if (!sb)
+        if (!fsi)
                 return -ENODEV;
 
-        fsi = DEVPTS_SB(sb);
 retry:
         if (!ida_pre_get(&fsi->allocated_ptys, GFP_KERNEL))
                 return -ENOMEM;
@@ -564,11 +563,8 @@ retry:
         return index;
 }
 
-void devpts_kill_index(struct inode *ptmx_inode, int idx)
+void devpts_kill_index(struct pts_fs_info *fsi, int idx)
 {
-        struct super_block *sb = pts_sb_from_inode(ptmx_inode);
-        struct pts_fs_info *fsi = DEVPTS_SB(sb);
-
         mutex_lock(&allocated_ptys_lock);
         ida_remove(&fsi->allocated_ptys, idx);
         pty_count--;
@@ -578,21 +574,25 @@ void devpts_kill_index(struct inode *ptmx_inode, int idx)
 /*
  * pty code needs to hold extra references in case of last /dev/tty close
  */
-
-void devpts_add_ref(struct inode *ptmx_inode)
+struct pts_fs_info *devpts_get_ref(struct inode *ptmx_inode, struct file *file)
 {
-        struct super_block *sb = pts_sb_from_inode(ptmx_inode);
+        struct super_block *sb;
+        struct pts_fs_info *fsi;
+
+        sb = pts_sb_from_inode(ptmx_inode);
+        if (!sb)
+                return NULL;
+        fsi = DEVPTS_SB(sb);
+        if (!fsi)
+                return NULL;
 
         atomic_inc(&sb->s_active);
-        ihold(ptmx_inode);
+        return fsi;
 }
 
-void devpts_del_ref(struct inode *ptmx_inode)
+void devpts_put_ref(struct pts_fs_info *fsi)
 {
-        struct super_block *sb = pts_sb_from_inode(ptmx_inode);
-
-        iput(ptmx_inode);
-        deactivate_super(sb);
+        deactivate_super(fsi->sb);
 }
 
 /**
@@ -604,22 +604,20 @@ void devpts_del_ref(struct inode *ptmx_inode)
  *
  * The created inode is returned. Remove it from /dev/pts/ by devpts_pty_kill.
  */
-struct inode *devpts_pty_new(struct inode *ptmx_inode, dev_t device, int index,
-                void *priv)
+struct dentry *devpts_pty_new(struct pts_fs_info *fsi, int index, void *priv)
 {
         struct dentry *dentry;
-        struct super_block *sb = pts_sb_from_inode(ptmx_inode);
+        struct super_block *sb;
         struct inode *inode;
         struct dentry *root;
-        struct pts_fs_info *fsi;
         struct pts_mount_opts *opts;
         char s[12];
 
-        if (!sb)
+        if (!fsi)
                 return ERR_PTR(-ENODEV);
 
+        sb = fsi->sb;
         root = sb->s_root;
-        fsi = DEVPTS_SB(sb);
         opts = &fsi->mount_opts;
 
         inode = new_inode(sb);
@@ -630,25 +628,21 @@ struct inode *devpts_pty_new(struct inode *ptmx_inode, dev_t device, int index,
         inode->i_uid = opts->setuid ? opts->uid : current_fsuid();
         inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
         inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-        init_special_inode(inode, S_IFCHR|opts->mode, device);
-        inode->i_private = priv;
+        init_special_inode(inode, S_IFCHR|opts->mode, MKDEV(UNIX98_PTY_SLAVE_MAJOR, index));
 
         sprintf(s, "%d", index);
 
-        inode_lock(d_inode(root));
-
         dentry = d_alloc_name(root, s);
         if (dentry) {
+                dentry->d_fsdata = priv;
                 d_add(dentry, inode);
                 fsnotify_create(d_inode(root), dentry);
         } else {
                 iput(inode);
-                inode = ERR_PTR(-ENOMEM);
+                dentry = ERR_PTR(-ENOMEM);
         }
 
-        inode_unlock(d_inode(root));
-
-        return inode;
+        return dentry;
 }
 
 /**
@@ -657,24 +651,10 @@ struct inode *devpts_pty_new(struct inode *ptmx_inode, dev_t device, int index,
  *
  * Returns whatever was passed as priv in devpts_pty_new for a given inode.
  */
-void *devpts_get_priv(struct inode *pts_inode)
+void *devpts_get_priv(struct dentry *dentry)
 {
-        struct dentry *dentry;
-        void *priv = NULL;
-
-        BUG_ON(pts_inode->i_rdev == MKDEV(TTYAUX_MAJOR, PTMX_MINOR));
-
-        /* Ensure dentry has not been deleted by devpts_pty_kill() */
-        dentry = d_find_alias(pts_inode);
-        if (!dentry)
-                return NULL;
-
-        if (pts_inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC)
-                priv = pts_inode->i_private;
-
-        dput(dentry);
-
-        return priv;
+        WARN_ON_ONCE(dentry->d_sb->s_magic != DEVPTS_SUPER_MAGIC);
+        return dentry->d_fsdata;
 }
 
 /**
@@ -683,24 +663,14 @@ void *devpts_get_priv(struct inode *pts_inode)
  *
  * This is an inverse operation of devpts_pty_new.
  */
-void devpts_pty_kill(struct inode *inode)
+void devpts_pty_kill(struct dentry *dentry)
 {
-        struct super_block *sb = pts_sb_from_inode(inode);
-        struct dentry *root = sb->s_root;
-        struct dentry *dentry;
+        WARN_ON_ONCE(dentry->d_sb->s_magic != DEVPTS_SUPER_MAGIC);
 
-        BUG_ON(inode->i_rdev == MKDEV(TTYAUX_MAJOR, PTMX_MINOR));
-
-        inode_lock(d_inode(root));
-
-        dentry = d_find_alias(inode);
-
-        drop_nlink(inode);
+        dentry->d_fsdata = NULL;
+        drop_nlink(dentry->d_inode);
         d_delete(dentry);
         dput(dentry);   /* d_alloc_name() in devpts_pty_new() */
-        dput(dentry);           /* d_find_alias above */
-
-        inode_unlock(d_inode(root));
 }
 
 static int __init init_devpts_fs(void)
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 9aed6e202201..13719d3f35f8 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -2455,6 +2455,8 @@ int dlm_deref_lockres_done_handler(struct o2net_msg *msg, u32 len, void *data,
 
         spin_unlock(&dlm->spinlock);
 
+        ret = 0;
+
 done:
         dlm_put(dlm);
         return ret;
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 229cb546bee0..541583510cfb 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -1518,6 +1518,32 @@ static struct page *can_gather_numa_stats(pte_t pte, struct vm_area_struct *vma,
         return page;
 }
 
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+static struct page *can_gather_numa_stats_pmd(pmd_t pmd,
+                                              struct vm_area_struct *vma,
+                                              unsigned long addr)
+{
+        struct page *page;
+        int nid;
+
+        if (!pmd_present(pmd))
+                return NULL;
+
+        page = vm_normal_page_pmd(vma, addr, pmd);
+        if (!page)
+                return NULL;
+
+        if (PageReserved(page))
+                return NULL;
+
+        nid = page_to_nid(page);
+        if (!node_isset(nid, node_states[N_MEMORY]))
+                return NULL;
+
+        return page;
+}
+#endif
+
 static int gather_pte_stats(pmd_t *pmd, unsigned long addr,
                 unsigned long end, struct mm_walk *walk)
 {
@@ -1527,14 +1553,14 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr,
         pte_t *orig_pte;
         pte_t *pte;
 
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
         ptl = pmd_trans_huge_lock(pmd, vma);
         if (ptl) {
-                pte_t huge_pte = *(pte_t *)pmd;
                 struct page *page;
 
-                page = can_gather_numa_stats(huge_pte, vma, addr);
+                page = can_gather_numa_stats_pmd(*pmd, vma, addr);
                 if (page)
-                        gather_stats(page, md, pte_dirty(huge_pte),
+                        gather_stats(page, md, pmd_dirty(*pmd),
                                      HPAGE_PMD_SIZE/PAGE_SIZE);
                 spin_unlock(ptl);
                 return 0;
@@ -1542,6 +1568,7 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr,
 
         if (pmd_trans_unstable(pmd))
                 return 0;
+#endif
         orig_pte = pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl);
         do {
                 struct page *page = can_gather_numa_stats(*pte, vma, addr);