leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'work.iget' into work.misc

Browse Source
This commit is contained in:
Al Viro 2016-10-08 10:44:37 -04:00
commit 33e09f0ee7
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
fs/inode.c
View File

@ -1021,13 +1021,17 @@ struct inode *iget5_locked(struct super_block *sb, unsigned long hashval,
{ {
struct hlist_head *head = inode_hashtable + hash(sb, hashval); struct hlist_head *head = inode_hashtable + hash(sb, hashval);
struct inode *inode; struct inode *inode;
again:
spin_lock(&inode_hash_lock); spin_lock(&inode_hash_lock);
inode = find_inode(sb, head, test, data); inode = find_inode(sb, head, test, data);
spin_unlock(&inode_hash_lock); spin_unlock(&inode_hash_lock);
if (inode) { if (inode) {
wait_on_inode(inode); wait_on_inode(inode);
if (unlikely(inode_unhashed(inode))) {
iput(inode);
goto again;
}
return inode; return inode;
} }
@ -1064,6 +1068,10 @@ struct inode *iget5_locked(struct super_block *sb, unsigned long hashval,
destroy_inode(inode); destroy_inode(inode);
inode = old; inode = old;
wait_on_inode(inode); wait_on_inode(inode);
if (unlikely(inode_unhashed(inode))) {
iput(inode);
goto again;
}
} }
return inode; return inode;
@ -1091,12 +1099,16 @@ struct inode *iget_locked(struct super_block *sb, unsigned long ino)
{ {
struct hlist_head *head = inode_hashtable + hash(sb, ino); struct hlist_head *head = inode_hashtable + hash(sb, ino);
struct inode *inode; struct inode *inode;
again:
spin_lock(&inode_hash_lock); spin_lock(&inode_hash_lock);
inode = find_inode_fast(sb, head, ino); inode = find_inode_fast(sb, head, ino);
spin_unlock(&inode_hash_lock); spin_unlock(&inode_hash_lock);
if (inode) { if (inode) {
wait_on_inode(inode); wait_on_inode(inode);
if (unlikely(inode_unhashed(inode))) {
iput(inode);
goto again;
}
return inode; return inode;
} }
@ -1131,6 +1143,10 @@ struct inode *iget_locked(struct super_block *sb, unsigned long ino)
destroy_inode(inode); destroy_inode(inode);
inode = old; inode = old;
wait_on_inode(inode); wait_on_inode(inode);
if (unlikely(inode_unhashed(inode))) {
iput(inode);
goto again;
}
} }
return inode; return inode;
} }
@ -1266,10 +1282,16 @@ EXPORT_SYMBOL(ilookup5_nowait);
struct inode *ilookup5(struct super_block *sb, unsigned long hashval, struct inode *ilookup5(struct super_block *sb, unsigned long hashval,
int (*test)(struct inode *, void *), void *data) int (*test)(struct inode *, void *), void *data)
{ {
struct inode *inode = ilookup5_nowait(sb, hashval, test, data); struct inode *inode;
again:
if (inode) inode = ilookup5_nowait(sb, hashval, test, data);
if (inode) {
wait_on_inode(inode); wait_on_inode(inode);
if (unlikely(inode_unhashed(inode))) {
iput(inode);
goto again;
}
}
return inode; return inode;
} }
EXPORT_SYMBOL(ilookup5); EXPORT_SYMBOL(ilookup5);
@ -1286,13 +1308,18 @@ struct inode *ilookup(struct super_block *sb, unsigned long ino)
{ {
struct hlist_head *head = inode_hashtable + hash(sb, ino); struct hlist_head *head = inode_hashtable + hash(sb, ino);
struct inode *inode; struct inode *inode;
again:
spin_lock(&inode_hash_lock); spin_lock(&inode_hash_lock);
inode = find_inode_fast(sb, head, ino); inode = find_inode_fast(sb, head, ino);
spin_unlock(&inode_hash_lock); spin_unlock(&inode_hash_lock);
if (inode) if (inode) {
wait_on_inode(inode); wait_on_inode(inode);
if (unlikely(inode_unhashed(inode))) {
iput(inode);
goto again;
}
}
return inode; return inode;
} }
EXPORT_SYMBOL(ilookup); EXPORT_SYMBOL(ilookup);