diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index e279c3ce27be3cd9f3048557bd90e06f21df9e85..4f405d43a86b64195224c9fb8ac11ed29cff5895 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -667,6 +667,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
 	ip->i_height = 0;
 	ip->i_depth = 0;
 	ip->i_entries = 0;
+	ip->i_no_addr = 0; /* Temporarily zero until real addr is assigned */
 
 	switch(mode & S_IFMT) {
 	case S_IFREG: