Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: fix missing initialization of i_dir_start_lookup member nilfs2: fix missing zero-fill initialization of btree node cache
This commit is contained in:
commit
9abf47f11b
|
@ -36,6 +36,7 @@
|
|||
|
||||
void nilfs_btnode_cache_init_once(struct address_space *btnc)
|
||||
{
|
||||
memset(btnc, 0, sizeof(*btnc));
|
||||
INIT_RADIX_TREE(&btnc->page_tree, GFP_ATOMIC);
|
||||
spin_lock_init(&btnc->tree_lock);
|
||||
INIT_LIST_HEAD(&btnc->private_list);
|
||||
|
|
|
@ -400,6 +400,7 @@ int nilfs_read_inode_common(struct inode *inode,
|
|||
ii->i_dir_acl = S_ISREG(inode->i_mode) ?
|
||||
0 : le32_to_cpu(raw_inode->i_dir_acl);
|
||||
#endif
|
||||
ii->i_dir_start_lookup = 0;
|
||||
ii->i_cno = 0;
|
||||
inode->i_generation = le32_to_cpu(raw_inode->i_generation);
|
||||
|
||||
|
|
Loading…
Reference in New Issue