aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-07-11 09:46:33 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-07-11 09:46:33 -0400
commit4340fe62531f7d1dafb6f5359ffe0378bdb0db80 (patch)
tree95ee3f2ace3b07e2fa89a9a01ccd5ac40a556eee /include
parentffeb874b2b893aea7d10b0b088e06a7b1ded2a3e (diff)
[GFS2] Add generation number
This adds a generation number for the eventual use of NFS to the ondisk inode. Its backward compatible with the current code since it doesn't really matter what the generation number is to start with, and indeed since its set to zero, due to it being taken from padding in both the inode and rgrp header, it should be fine. The eventual plan is to use this rather than no_formal_ino in the NFS filehandles. At that point no_formal_ino will be unused. At the same time we also add a releasepages call back to the "normal" address space for gfs2 inodes. Also I've removed a one-linrer function thats not required any more. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/gfs2_ondisk.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index 1181da831939..3ebd8743ce8c 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -170,8 +170,10 @@ struct gfs2_rgrp {
170 __be32 rg_flags; 170 __be32 rg_flags;
171 __be32 rg_free; 171 __be32 rg_free;
172 __be32 rg_dinodes; 172 __be32 rg_dinodes;
173 __be32 __pad;
174 __be64 rg_igeneration;
173 175
174 __u8 rg_reserved[92]; /* Several fields from gfs1 now reserved */ 176 __u8 rg_reserved[80]; /* Several fields from gfs1 now reserved */
175}; 177};
176 178
177/* 179/*
@@ -248,7 +250,7 @@ struct gfs2_dinode {
248 */ 250 */
249 __be64 di_goal_meta; /* rgrp to alloc from next */ 251 __be64 di_goal_meta; /* rgrp to alloc from next */
250 __be64 di_goal_data; /* data block goal */ 252 __be64 di_goal_data; /* data block goal */
251 __u32 __pad[2]; 253 __be64 di_generation; /* generation number for NFS */
252 254
253 __be32 di_flags; /* GFS2_DIF_... */ 255 __be32 di_flags; /* GFS2_DIF_... */
254 __be32 di_payload_format; /* GFS2_FORMAT_... */ 256 __be32 di_payload_format; /* GFS2_FORMAT_... */