summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-30 09:42:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-30 09:42:24 -0700
commit9abf47f11b38f5ecf411b9a44437cad5016631ad (patch)
tree3b8cec7d5f98cb037c904bf30a9fad639aad0530 /fs
parent9f44fdc5188bc1a0bbcc3453d57f01e49ba868d9 (diff)
parent3cc811bffdf35ebaf1467fbec71a49b57800fc74 (diff)
downloadtalos-op-linux-9abf47f11b38f5ecf411b9a44437cad5016631ad.tar.gz
talos-op-linux-9abf47f11b38f5ecf411b9a44437cad5016631ad.zip
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
Diffstat (limited to 'fs')
-rw-r--r--fs/nilfs2/btnode.c1
-rw-r--r--fs/nilfs2/inode.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c
index 6a2711f4c321..5941958f1e47 100644
--- a/fs/nilfs2/btnode.c
+++ b/fs/nilfs2/btnode.c
@@ -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);
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index 2d2c501deb54..5040220c3732 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -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);
OpenPOWER on IntegriCloud