Merge tag 'drm-intel-fixes-2014-03-17' of git://anongit.freedesktop.org/drm-intel...

[~andy/linux] / fs / nilfs2 / the_nilfs.c

diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index 41e6a04a561f36ac1bd190b80dd2c10def4cf176..94c451ce6d247b5ca0e284a8667308d6509d0741 100644 (file)
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -764,8 +764,8 @@ nilfs_find_or_create_root(struct the_nilfs *nilfs, __u64 cno)
        new->ifile = NULL;
        new->nilfs = nilfs;
        atomic_set(&new->count, 1);
-       atomic_set(&new->inodes_count, 0);
-       atomic_set(&new->blocks_count, 0);
+       atomic64_set(&new->inodes_count, 0);
+       atomic64_set(&new->blocks_count, 0);
 
        rb_link_node(&new->rb_node, parent, p);
        rb_insert_color(&new->rb_node, &nilfs->ns_cptree);