aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2008-11-03 08:39:46 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2009-01-05 02:38:55 -0500
commitbcf0b5b348a1f49c2c878ffdb78e68c930baabb8 (patch)
treef5ee33d171f397bbcf55b3138b41b7684d6e4654 /fs/gfs2
parent55ba474daed9763b2f6fe26ad762ee373554d65e (diff)
GFS2: Move generation number into "proper" part of inode
This moves the generation number from the gfs2_dinode_host into the gfs2_inode structure. Eventually the plan is to get rid of the gfs2_dinode_host structure completely. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/incore.h2
-rw-r--r--fs/gfs2/inode.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index f566ec1b4e8e..4ff1d7ecd98a 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -235,7 +235,6 @@ enum {
235 235
236struct gfs2_dinode_host { 236struct gfs2_dinode_host {
237 u64 di_size; /* number of bytes in file */ 237 u64 di_size; /* number of bytes in file */
238 u64 di_generation; /* generation number for NFS */
239 u32 di_flags; /* GFS2_DIF_... */ 238 u32 di_flags; /* GFS2_DIF_... */
240 /* These only apply to directories */ 239 /* These only apply to directories */
241 u32 di_entries; /* The number of entries in the directory */ 240 u32 di_entries; /* The number of entries in the directory */
@@ -246,6 +245,7 @@ struct gfs2_inode {
246 struct inode i_inode; 245 struct inode i_inode;
247 u64 i_no_addr; 246 u64 i_no_addr;
248 u64 i_no_formal_ino; 247 u64 i_no_formal_ino;
248 u64 i_generation;
249 unsigned long i_flags; /* GIF_... */ 249 unsigned long i_flags; /* GIF_... */
250 250
251 struct gfs2_dinode_host i_di; /* To be replaced by ref to block */ 251 struct gfs2_dinode_host i_di; /* To be replaced by ref to block */
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index bf4676d7acd5..9d97f699c81a 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -286,7 +286,7 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)
286 ip->i_inode.i_ctime.tv_nsec = be32_to_cpu(str->di_ctime_nsec); 286 ip->i_inode.i_ctime.tv_nsec = be32_to_cpu(str->di_ctime_nsec);
287 287
288 ip->i_goal = be64_to_cpu(str->di_goal_meta); 288 ip->i_goal = be64_to_cpu(str->di_goal_meta);
289 di->di_generation = be64_to_cpu(str->di_generation); 289 ip->i_generation = be64_to_cpu(str->di_generation);
290 290
291 di->di_flags = be32_to_cpu(str->di_flags); 291 di->di_flags = be32_to_cpu(str->di_flags);
292 gfs2_set_inode_flags(&ip->i_inode); 292 gfs2_set_inode_flags(&ip->i_inode);
@@ -1263,7 +1263,7 @@ void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf)
1263 1263
1264 str->di_goal_meta = cpu_to_be64(ip->i_goal); 1264 str->di_goal_meta = cpu_to_be64(ip->i_goal);
1265 str->di_goal_data = cpu_to_be64(ip->i_goal); 1265 str->di_goal_data = cpu_to_be64(ip->i_goal);
1266 str->di_generation = cpu_to_be64(di->di_generation); 1266 str->di_generation = cpu_to_be64(ip->i_generation);
1267 1267
1268 str->di_flags = cpu_to_be32(di->di_flags); 1268 str->di_flags = cpu_to_be32(di->di_flags);
1269 str->di_height = cpu_to_be16(ip->i_height); 1269 str->di_height = cpu_to_be16(ip->i_height);