Commit 646ec461 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro

fs: remove inode_add_to_list/__inode_add_to_list

Split up inode_add_to_list/__inode_add_to_list.  Locking for the two
lists will be split soon so these helpers really don't buy us much
anymore.

The __ prefixes for the sb list helpers will go away soon, but until
inode_lock is gone we'll need them to distinguish between the locked
and unlocked variants.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f7899bd5
...@@ -336,6 +336,28 @@ static void inode_lru_list_del(struct inode *inode) ...@@ -336,6 +336,28 @@ static void inode_lru_list_del(struct inode *inode)
} }
} }
static inline void __inode_sb_list_add(struct inode *inode)
{
list_add(&inode->i_sb_list, &inode->i_sb->s_inodes);
}
/**
* inode_sb_list_add - add inode to the superblock list of inodes
* @inode: inode to add
*/
void inode_sb_list_add(struct inode *inode)
{
spin_lock(&inode_lock);
__inode_sb_list_add(inode);
spin_unlock(&inode_lock);
}
EXPORT_SYMBOL_GPL(inode_sb_list_add);
static inline void __inode_sb_list_del(struct inode *inode)
{
list_del_init(&inode->i_sb_list);
}
static unsigned long hash(struct super_block *sb, unsigned long hashval) static unsigned long hash(struct super_block *sb, unsigned long hashval)
{ {
unsigned long tmp; unsigned long tmp;
...@@ -356,9 +378,10 @@ static unsigned long hash(struct super_block *sb, unsigned long hashval) ...@@ -356,9 +378,10 @@ static unsigned long hash(struct super_block *sb, unsigned long hashval)
*/ */
void __insert_inode_hash(struct inode *inode, unsigned long hashval) void __insert_inode_hash(struct inode *inode, unsigned long hashval)
{ {
struct hlist_head *head = inode_hashtable + hash(inode->i_sb, hashval); struct hlist_head *b = inode_hashtable + hash(inode->i_sb, hashval);
spin_lock(&inode_lock); spin_lock(&inode_lock);
hlist_add_head(&inode->i_hash, head); hlist_add_head(&inode->i_hash, b);
spin_unlock(&inode_lock); spin_unlock(&inode_lock);
} }
EXPORT_SYMBOL(__insert_inode_hash); EXPORT_SYMBOL(__insert_inode_hash);
...@@ -436,7 +459,7 @@ static void dispose_list(struct list_head *head) ...@@ -436,7 +459,7 @@ static void dispose_list(struct list_head *head)
spin_lock(&inode_lock); spin_lock(&inode_lock);
__remove_inode_hash(inode); __remove_inode_hash(inode);
list_del_init(&inode->i_sb_list); __inode_sb_list_del(inode);
spin_unlock(&inode_lock); spin_unlock(&inode_lock);
wake_up_inode(inode); wake_up_inode(inode);
...@@ -685,37 +708,6 @@ static struct inode *find_inode_fast(struct super_block *sb, ...@@ -685,37 +708,6 @@ static struct inode *find_inode_fast(struct super_block *sb,
return NULL; return NULL;
} }
static inline void
__inode_add_to_lists(struct super_block *sb, struct hlist_head *head,
struct inode *inode)
{
list_add(&inode->i_sb_list, &sb->s_inodes);
if (head)
hlist_add_head(&inode->i_hash, head);
}
/**
* inode_add_to_lists - add a new inode to relevant lists
* @sb: superblock inode belongs to
* @inode: inode to mark in use
*
* When an inode is allocated it needs to be accounted for, added to the in use
* list, the owning superblock and the inode hash. This needs to be done under
* the inode_lock, so export a function to do this rather than the inode lock
* itself. We calculate the hash list to add to here so it is all internal
* which requires the caller to have already set up the inode number in the
* inode to add.
*/
void inode_add_to_lists(struct super_block *sb, struct inode *inode)
{
struct hlist_head *head = inode_hashtable + hash(sb, inode->i_ino);
spin_lock(&inode_lock);
__inode_add_to_lists(sb, head, inode);
spin_unlock(&inode_lock);
}
EXPORT_SYMBOL_GPL(inode_add_to_lists);
/** /**
* new_inode - obtain an inode * new_inode - obtain an inode
* @sb: superblock * @sb: superblock
...@@ -743,7 +735,7 @@ struct inode *new_inode(struct super_block *sb) ...@@ -743,7 +735,7 @@ struct inode *new_inode(struct super_block *sb)
inode = alloc_inode(sb); inode = alloc_inode(sb);
if (inode) { if (inode) {
spin_lock(&inode_lock); spin_lock(&inode_lock);
__inode_add_to_lists(sb, NULL, inode); __inode_sb_list_add(inode);
inode->i_ino = ++last_ino; inode->i_ino = ++last_ino;
inode->i_state = 0; inode->i_state = 0;
spin_unlock(&inode_lock); spin_unlock(&inode_lock);
...@@ -812,7 +804,8 @@ static struct inode *get_new_inode(struct super_block *sb, ...@@ -812,7 +804,8 @@ static struct inode *get_new_inode(struct super_block *sb,
if (set(inode, data)) if (set(inode, data))
goto set_failed; goto set_failed;
__inode_add_to_lists(sb, head, inode); hlist_add_head(&inode->i_hash, head);
__inode_sb_list_add(inode);
inode->i_state = I_NEW; inode->i_state = I_NEW;
spin_unlock(&inode_lock); spin_unlock(&inode_lock);
...@@ -858,7 +851,8 @@ static struct inode *get_new_inode_fast(struct super_block *sb, ...@@ -858,7 +851,8 @@ static struct inode *get_new_inode_fast(struct super_block *sb,
old = find_inode_fast(sb, head, ino); old = find_inode_fast(sb, head, ino);
if (!old) { if (!old) {
inode->i_ino = ino; inode->i_ino = ino;
__inode_add_to_lists(sb, head, inode); hlist_add_head(&inode->i_hash, head);
__inode_sb_list_add(inode);
inode->i_state = I_NEW; inode->i_state = I_NEW;
spin_unlock(&inode_lock); spin_unlock(&inode_lock);
...@@ -1318,7 +1312,7 @@ static void iput_final(struct inode *inode) ...@@ -1318,7 +1312,7 @@ static void iput_final(struct inode *inode)
*/ */
inode_lru_list_del(inode); inode_lru_list_del(inode);
list_del_init(&inode->i_sb_list); __inode_sb_list_del(inode);
spin_unlock(&inode_lock); spin_unlock(&inode_lock);
evict(inode); evict(inode);
remove_inode_hash(inode); remove_inode_hash(inode);
......
...@@ -760,7 +760,9 @@ xfs_setup_inode( ...@@ -760,7 +760,9 @@ xfs_setup_inode(
inode->i_ino = ip->i_ino; inode->i_ino = ip->i_ino;
inode->i_state = I_NEW; inode->i_state = I_NEW;
inode_add_to_lists(ip->i_mount->m_super, inode);
inode_sb_list_add(inode);
insert_inode_hash(inode);
inode->i_mode = ip->i_d.di_mode; inode->i_mode = ip->i_d.di_mode;
inode->i_nlink = ip->i_d.di_nlink; inode->i_nlink = ip->i_d.di_nlink;
......
...@@ -2171,7 +2171,6 @@ extern loff_t vfs_llseek(struct file *file, loff_t offset, int origin); ...@@ -2171,7 +2171,6 @@ extern loff_t vfs_llseek(struct file *file, loff_t offset, int origin);
extern int inode_init_always(struct super_block *, struct inode *); extern int inode_init_always(struct super_block *, struct inode *);
extern void inode_init_once(struct inode *); extern void inode_init_once(struct inode *);
extern void inode_add_to_lists(struct super_block *, struct inode *);
extern void iput(struct inode *); extern void iput(struct inode *);
extern struct inode * igrab(struct inode *); extern struct inode * igrab(struct inode *);
extern ino_t iunique(struct super_block *, ino_t); extern ino_t iunique(struct super_block *, ino_t);
...@@ -2202,9 +2201,11 @@ extern int file_remove_suid(struct file *); ...@@ -2202,9 +2201,11 @@ extern int file_remove_suid(struct file *);
extern void __insert_inode_hash(struct inode *, unsigned long hashval); extern void __insert_inode_hash(struct inode *, unsigned long hashval);
extern void remove_inode_hash(struct inode *); extern void remove_inode_hash(struct inode *);
static inline void insert_inode_hash(struct inode *inode) { static inline void insert_inode_hash(struct inode *inode)
{
__insert_inode_hash(inode, inode->i_ino); __insert_inode_hash(inode, inode->i_ino);
} }
extern void inode_sb_list_add(struct inode *inode);
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK
extern void submit_bio(int, struct bio *); extern void submit_bio(int, struct bio *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment