Merge branch 'master' into next

Conflicts:
	fs/namei.c

Manually merged per:

diff --cc fs/namei.c
index 734f2b5,bbc15c2..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -860,9 -848,8 +849,10 @@@ static int __link_path_walk(const char
  		nd->flags |= LOOKUP_CONTINUE;
  		err = exec_permission_lite(inode);
  		if (err == -EAGAIN)
- 			err = vfs_permission(nd, MAY_EXEC);
+ 			err = inode_permission(nd->path.dentry->d_inode,
+ 					       MAY_EXEC);
 +		if (!err)
 +			err = ima_path_check(&nd->path, MAY_EXEC);
   		if (err)
  			break;

@@@ -1525,14 -1506,9 +1509,14 @@@ int may_open(struct path *path, int acc
  		flag &= ~O_TRUNC;
  	}

- 	error = vfs_permission(nd, acc_mode);
+ 	error = inode_permission(inode, acc_mode);
  	if (error)
  		return error;
 +
- 	error = ima_path_check(&nd->path,
++	error = ima_path_check(path,
 +			       acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC));
 +	if (error)
 +		return error;
  	/*
  	 * An append-only file must be opened in append mode for writing.
  	 */

Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c
index 80aba5bdd4a4..eda43f362616 100644
--- a/fs/dlm/recover.c
+++ b/fs/dlm/recover.c
@@ -726,7 +726,7 @@ int dlm_create_root_list(struct dlm_ls *ls)
         }
 
         for (i = 0; i < ls->ls_rsbtbl_size; i++) {
-                read_lock(&ls->ls_rsbtbl[i].lock);
+                spin_lock(&ls->ls_rsbtbl[i].lock);
                 list_for_each_entry(r, &ls->ls_rsbtbl[i].list, res_hashchain) {
                         list_add(&r->res_root_list, &ls->ls_root_list);
                         dlm_hold_rsb(r);
@@ -737,7 +737,7 @@ int dlm_create_root_list(struct dlm_ls *ls)
                    but no other recovery steps should do anything with them. */
 
                 if (dlm_no_directory(ls)) {
-                        read_unlock(&ls->ls_rsbtbl[i].lock);
+                        spin_unlock(&ls->ls_rsbtbl[i].lock);
                         continue;
                 }
 
@@ -745,7 +745,7 @@ int dlm_create_root_list(struct dlm_ls *ls)
                         list_add(&r->res_root_list, &ls->ls_root_list);
                         dlm_hold_rsb(r);
                 }
-                read_unlock(&ls->ls_rsbtbl[i].lock);
+                spin_unlock(&ls->ls_rsbtbl[i].lock);
         }
  out:
         up_write(&ls->ls_root_sem);
@@ -775,7 +775,7 @@ void dlm_clear_toss_list(struct dlm_ls *ls)
         int i;
 
         for (i = 0; i < ls->ls_rsbtbl_size; i++) {
-                write_lock(&ls->ls_rsbtbl[i].lock);
+                spin_lock(&ls->ls_rsbtbl[i].lock);
                 list_for_each_entry_safe(r, safe, &ls->ls_rsbtbl[i].toss,
                                          res_hashchain) {
                         if (dlm_no_directory(ls) || !is_master(r)) {
@@ -783,7 +783,7 @@ void dlm_clear_toss_list(struct dlm_ls *ls)
                                 dlm_free_rsb(r);
                         }
                 }
-                write_unlock(&ls->ls_rsbtbl[i].lock);
+                spin_unlock(&ls->ls_rsbtbl[i].lock);
         }
 }