Skip to content
Snippets Groups Projects
Commit 9b32011a authored by James Morris's avatar James Morris
Browse files

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

parents 0429fbc0 923190d3
No related merge requests found
...@@ -481,6 +481,7 @@ next_inode: ...@@ -481,6 +481,7 @@ next_inode:
list_entry(sbsec->isec_head.next, list_entry(sbsec->isec_head.next,
struct inode_security_struct, list); struct inode_security_struct, list);
struct inode *inode = isec->inode; struct inode *inode = isec->inode;
list_del_init(&isec->list);
spin_unlock(&sbsec->isec_lock); spin_unlock(&sbsec->isec_lock);
inode = igrab(inode); inode = igrab(inode);
if (inode) { if (inode) {
...@@ -489,7 +490,6 @@ next_inode: ...@@ -489,7 +490,6 @@ next_inode:
iput(inode); iput(inode);
} }
spin_lock(&sbsec->isec_lock); spin_lock(&sbsec->isec_lock);
list_del_init(&isec->list);
goto next_inode; goto next_inode;
} }
spin_unlock(&sbsec->isec_lock); spin_unlock(&sbsec->isec_lock);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment