---

yaml --- r: 174354 b: refs/heads/master c: 9cfdc7a h: refs/heads/master v: v3
git-mirror · Dec 10, 2009 · bdf9abf · bdf9abf
1 parent 63dc2f5
commit bdf9abf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe33cc1ee170c0e3b47ab9cbac07083b3446961c
+refs/heads/master: 9cfdc7aa9f1b59627029ad00a58c3f59eb2cc383
diff --git a/trunk/fs/exofs/inode.c b/trunk/fs/exofs/inode.c
@@ -908,6 +908,12 @@ static int exofs_get_inode(struct super_block *sb, struct exofs_i_info *oi,
 	return ret;
 }
 
+
+static void __oi_init(struct exofs_i_info *oi)
+{
+	init_waitqueue_head(&oi->i_wq);
+	oi->i_flags = 0;
+}
 /*
  * Fill in an inode read from the OSD and set it up for use
  */
@@ -925,13 +931,13 @@ struct inode *exofs_iget(struct super_block *sb, unsigned long ino)
 	if (!(inode->i_state & I_NEW))
 		return inode;
 	oi = exofs_i(inode);
+	__oi_init(oi);
 
 	/* read the inode from the osd */
 	ret = exofs_get_inode(sb, oi, &fcb, &sanity);
 	if (ret)
 		goto bad_inode;
 
-	init_waitqueue_head(&oi->i_wq);
 	set_obj_created(oi);
 
 	/* copy stuff from on-disk struct to in-memory struct */
@@ -1062,8 +1068,8 @@ struct inode *exofs_new_inode(struct inode *dir, int mode)
 		return ERR_PTR(-ENOMEM);
 
 	oi = exofs_i(inode);
+	__oi_init(oi);
 
-	init_waitqueue_head(&oi->i_wq);
 	set_obj_2bcreated(oi);
 
 	sbi = sb->s_fs_info;