1 files changed, 2 insertions, 4 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 29e64d4ca099..e66314138b38 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -481,6 +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 @@ next_inode:
                         iput(inode);
                 }
                 spin_lock(&sbsec->isec_lock);
-                list_del_init(&isec->list);
                 goto next_inode;
         }
         spin_unlock(&sbsec->isec_lock);
@@ -3381,14 +3381,12 @@ static int selinux_file_fcntl(struct file *file, unsigned int cmd,
         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,