---

yaml --- r: 36194 b: refs/heads/master c: 4c15416 h: refs/heads/master v: v3
git-mirror · Sep 27, 2006 · f4fe317 · f4fe317
1 parent bcc21ff
commit f4fe317
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e18e2941c53416aa219708e7dcad21fb4bd6794
+refs/heads/master: 4c1541680f8d189d21dd07b053bc12996574646e
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
@@ -528,9 +528,10 @@ struct inode {
 #ifdef CONFIG_QUOTA
 	struct dquot		*i_dquot[MAXQUOTAS];
 #endif
-	/* These three should probably be a union */
 	struct list_head	i_devices;
-	struct pipe_inode_info	*i_pipe;
+	union {
+		struct pipe_inode_info	*i_pipe;
+	};
 	struct block_device	*i_bdev;
 	struct cdev		*i_cdev;
 	int			i_cindex;