diff options
Diffstat (limited to 'fs/inode.c')
-rw-r--r-- | fs/inode.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/inode.c b/fs/inode.c index 88110fd0b282..db5914783a71 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
@@ -119,7 +119,7 @@ static int no_open(struct inode *inode, struct file *file) | |||
119 | } | 119 | } |
120 | 120 | ||
121 | /** | 121 | /** |
122 | * inode_init_always - perform inode structure intialisation | 122 | * inode_init_always - perform inode structure initialisation |
123 | * @sb: superblock inode belongs to | 123 | * @sb: superblock inode belongs to |
124 | * @inode: inode to initialise | 124 | * @inode: inode to initialise |
125 | * | 125 | * |
@@ -371,9 +371,6 @@ void inode_init_once(struct inode *inode) | |||
371 | INIT_LIST_HEAD(&inode->i_lru); | 371 | INIT_LIST_HEAD(&inode->i_lru); |
372 | address_space_init_once(&inode->i_data); | 372 | address_space_init_once(&inode->i_data); |
373 | i_size_ordered_init(inode); | 373 | i_size_ordered_init(inode); |
374 | #ifdef CONFIG_FSNOTIFY | ||
375 | INIT_HLIST_HEAD(&inode->i_fsnotify_marks); | ||
376 | #endif | ||
377 | } | 374 | } |
378 | EXPORT_SYMBOL(inode_init_once); | 375 | EXPORT_SYMBOL(inode_init_once); |
379 | 376 | ||
@@ -405,6 +402,8 @@ static void inode_lru_list_add(struct inode *inode) | |||
405 | { | 402 | { |
406 | if (list_lru_add(&inode->i_sb->s_inode_lru, &inode->i_lru)) | 403 | if (list_lru_add(&inode->i_sb->s_inode_lru, &inode->i_lru)) |
407 | this_cpu_inc(nr_unused); | 404 | this_cpu_inc(nr_unused); |
405 | else | ||
406 | inode->i_state |= I_REFERENCED; | ||
408 | } | 407 | } |
409 | 408 | ||
410 | /* | 409 | /* |
@@ -1492,7 +1491,6 @@ static void iput_final(struct inode *inode) | |||
1492 | drop = generic_drop_inode(inode); | 1491 | drop = generic_drop_inode(inode); |
1493 | 1492 | ||
1494 | if (!drop && (sb->s_flags & MS_ACTIVE)) { | 1493 | if (!drop && (sb->s_flags & MS_ACTIVE)) { |
1495 | inode->i_state |= I_REFERENCED; | ||
1496 | inode_add_lru(inode); | 1494 | inode_add_lru(inode); |
1497 | spin_unlock(&inode->i_lock); | 1495 | spin_unlock(&inode->i_lock); |
1498 | return; | 1496 | return; |