summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2006-09-27 10:50:47 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 17:26:17 +0200
commit4c1541680f8d189d21dd07b053bc12996574646e (patch)
tree82028e01537a968ef66b075f79f3c95f8c60fd70 /include
parent[PATCH] inode_diet: Replace inode.u.generic_ip with inode.i_private (diff)
downloadlinux-4c1541680f8d189d21dd07b053bc12996574646e.tar.xz
linux-4c1541680f8d189d21dd07b053bc12996574646e.zip
[PATCH] inode-diet: Move i_pipe into a union
Move the i_pipe pointer into a union that will be shared with i_bdev and i_cdev. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 4f77ec9c3353..ca695fc8d69c 100644
--- a/include/linux/fs.h
+++ b/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;