Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into...

diff --combined security/selinux/hooks.c
index 8426a2aa8dce37abaa4d0cad8d20cb56113ce453,2478976fc894ee2598e439545873a1a860fbb29e..e66314138b3822036968abb52b672dcfc02c73ee
--- 1/security/selinux/hooks.c
--- 2/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -481,6 -481,7 +481,7 @@@ next_inode
                                list_entry(sbsec->isec_head.next,
                                           struct inode_security_struct, list);
                struct inode *inode = isec->inode;
+               list_del_init(&isec->list);
                spin_unlock(&sbsec->isec_lock);
                inode = igrab(inode);
                if (inode) {
@@@ -489,7 -490,6 +490,6 @@@
                        iput(inode);
                }
                spin_lock(&sbsec->isec_lock);
-               list_del_init(&isec->list);
                goto next_inode;
        }
        spin_unlock(&sbsec->isec_lock);
@@@ -3381,12 -3381,14 +3381,12 @@@ static int selinux_file_fcntl(struct fi
        return err;
  }
  
 -static int selinux_file_set_fowner(struct file *file)
 +static void selinux_file_set_fowner(struct file *file)
  {
        struct file_security_struct *fsec;
  
        fsec = file->f_security;
        fsec->fown_sid = current_sid();
 -
 -      return 0;
  }
  
  static int selinux_file_send_sigiotask(struct task_struct *tsk,