Change argument to gfs2_dinode_in [18/70]
From 891ea14712da68e282de8583e5fa14f0d3f3731e Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <[email protected]>
Date: Tue, 31 Oct 2006 15:22:10 -0500
Subject: [PATCH] [GFS2] Change argument to gfs2_dinode_in
This is a preliminary patch to enable the removal of fields in gfs2_dinode_host which are duplicated in struct inode.
--- fs/gfs2/inode.c | 2 +- fs/gfs2/ondisk.c | 4 ++-- include/linux/gfs2_ondisk.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
fs/gfs2/inode.c +1 -1
@@ -229,7 +229,7 @@ int gfs2_inode_refresh(struct gfs2_inodereturn -EIO ; } -gfs2_dinode_in (&ip->i_di, dibh->b_data); +gfs2_dinode_in (ip, dibh->b_data);brelse (dibh);
fs/gfs2/ondisk.c +2 -2
@@ -155,8 +155,9 @@ void gfs2_quota_in(struct gfs2_quota_hos qu->qu_value =be64_to_cpu (str->qu_value); } -void gfs2_dinode_in (struct gfs2_dinode_host *di,const void *buf) +void gfs2_dinode_in (struct gfs2_inode *ip,const void *buf) { +struct gfs2_dinode_host *di = &ip->i_di;const struct gfs2_dinode *str = buf;gfs2_meta_header_in (&di->di_header, buf);
@@ -186,7 +187,6 @@ void gfs2_dinode_in(struct gfs2_dinode_h di->di_entries =be32_to_cpu (str->di_entries); di->di_eattr =be64_to_cpu (str->di_eattr); - }void gfs2_dinode_out (const struct gfs2_inode *ip,void *buf)
include/linux/gfs2_ondisk.h +1 -1
@@ -534,8 +534,8 @@ extern void gfs2_rindex_out(const structextern void gfs2_rgrp_in (struct gfs2_rgrp_host *rg,const void *buf);extern void gfs2_rgrp_out (const struct gfs2_rgrp_host *rg,void *buf);extern void gfs2_quota_in (struct gfs2_quota_host *qu,const void *buf); -extern void gfs2_dinode_in (struct gfs2_dinode_host *di,const void *buf);struct gfs2_inode ; +extern void gfs2_dinode_in (struct gfs2_inode *ip,const void *buf);extern void gfs2_dinode_out (const struct gfs2_inode *ip,void *buf);extern void gfs2_ea_header_in (struct gfs2_ea_header *ea,const void *buf);extern void gfs2_ea_header_out (const struct gfs2_ea_header *ea,void *buf);
Signature · 1 line
1.4.1
Quoted 7 lines · Steven Whitehouse
Quoted 1 line
From
891ea14712da68e282de8583e5fa14f0d3f3731eMon Sep 17 00:00:00 2001From: Steven Whitehouse <[email protected]>
Date: Tue, 31 Oct 2006 15:22:10 -0500
Subject: [PATCH] [GFS2] Change argument togfs2_dinode_inThis is a preliminary patch to enable the removal of fields in
gfs2_dinode_hostwhich are duplicated in struct inode.
Deferred till the complete "cleanup" work is done?
Quoted 58 lines
Signed-off-by Steven Whitehouse <[email protected]>--- fs/gfs2/inode.c | 2 +- fs/gfs2/ondisk.c | 4 ++-- include/linux/gfs2_ondisk.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)fs/gfs2/inode.c +1
-1@@ -229,7 +229,7 @@ int gfs2_inode_refresh(struct gfs2_inodereturn -EIO ; } -gfs2_dinode_in (&ip->i_di, dibh->b_data); +gfs2_dinode_in (ip, dibh->b_data);brelse (dibh);fs/gfs2/ondisk.c +2
-2@@ -155,8 +155,9 @@ void gfs2_quota_in(struct gfs2_quota_hos qu->qu_value =be64_to_cpu (str->qu_value); } -void gfs2_dinode_in (struct gfs2_dinode_host *di,const void *buf) +void gfs2_dinode_in (struct gfs2_inode *ip,const void *buf) { +struct gfs2_dinode_host *di = &ip->i_di;const struct gfs2_dinode *str = buf;gfs2_meta_header_in (&di->di_header, buf);@@ -186,7 +187,6 @@ void gfs2_dinode_in(struct gfs2_dinode_h di->di_entries =be32_to_cpu (str->di_entries); di->di_eattr =be64_to_cpu (str->di_eattr); - }void gfs2_dinode_out (const struct gfs2_inode *ip,void *buf)include/linux/gfs2_ondisk.h +1
-1@@ -534,8 +534,8 @@ extern void gfs2_rindex_out(const structextern void gfs2_rgrp_in (struct gfs2_rgrp_host *rg,const void *buf);extern void gfs2_rgrp_out (const struct gfs2_rgrp_host *rg,void *buf);extern void gfs2_quota_in (struct gfs2_quota_host *qu,const void *buf); -extern void gfs2_dinode_in (struct gfs2_dinode_host *di,const void *buf);struct gfs2_inode ; +extern void gfs2_dinode_in (struct gfs2_inode *ip,const void *buf);extern void gfs2_dinode_out (const struct gfs2_inode *ip,void *buf);extern void gfs2_ea_header_in (struct gfs2_ea_header *ea,const void *buf);extern void gfs2_ea_header_out (const struct gfs2_ea_header *ea,void *buf);
Signature · 8 lines
Russell Cattelan <[email protected]> -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part URL: <http://listman.redhat.com/archives/cluster-devel/attachments/20061201/a3fd0c6d/attachment.sig>
Hi,
Quoted 11 lines · Russell Cattelan
Quoted 7 lines · Steven Whitehouse
Quoted 1 line
From
891ea14712da68e282de8583e5fa14f0d3f3731eMon Sep 17 00:00:00 2001From: Steven Whitehouse <[email protected]>
Date: Tue, 31 Oct 2006 15:22:10 -0500
Subject: [PATCH] [GFS2] Change argument togfs2_dinode_inThis is a preliminary patch to enable the removal of fields in
gfs2_dinode_hostwhich are duplicated in struct inode.Deferred till the complete "cleanup" work is done?
It can't be deferred - its a prerequisite of most of the cleanup work so it needs to go in near the start of the patch series,
Steve.
Quoted 58 lines
Quoted 58 lines
Signed-off-by Steven Whitehouse <[email protected]>--- fs/gfs2/inode.c | 2 +- fs/gfs2/ondisk.c | 4 ++-- include/linux/gfs2_ondisk.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)fs/gfs2/inode.c +1
-1@@ -229,7 +229,7 @@ int gfs2_inode_refresh(struct gfs2_inodereturn -EIO ; } -gfs2_dinode_in (&ip->i_di, dibh->b_data); +gfs2_dinode_in (ip, dibh->b_data);brelse (dibh);fs/gfs2/ondisk.c +2
-2@@ -155,8 +155,9 @@ void gfs2_quota_in(struct gfs2_quota_hos qu->qu_value =be64_to_cpu (str->qu_value); } -void gfs2_dinode_in (struct gfs2_dinode_host *di,const void *buf) +void gfs2_dinode_in (struct gfs2_inode *ip,const void *buf) { +struct gfs2_dinode_host *di = &ip->i_di;const struct gfs2_dinode *str = buf;gfs2_meta_header_in (&di->di_header, buf);@@ -186,7 +187,6 @@ void gfs2_dinode_in(struct gfs2_dinode_h di->di_entries =be32_to_cpu (str->di_entries); di->di_eattr =be64_to_cpu (str->di_eattr); - }void gfs2_dinode_out (const struct gfs2_inode *ip,void *buf)include/linux/gfs2_ondisk.h +1
-1@@ -534,8 +534,8 @@ extern void gfs2_rindex_out(const structextern void gfs2_rgrp_in (struct gfs2_rgrp_host *rg,const void *buf);extern void gfs2_rgrp_out (const struct gfs2_rgrp_host *rg,void *buf);extern void gfs2_quota_in (struct gfs2_quota_host *qu,const void *buf); -extern void gfs2_dinode_in (struct gfs2_dinode_host *di,const void *buf);struct gfs2_inode ; +extern void gfs2_dinode_in (struct gfs2_inode *ip,const void *buf);extern void gfs2_dinode_out (const struct gfs2_inode *ip,void *buf);extern void gfs2_ea_header_in (struct gfs2_ea_header *ea,const void *buf);extern void gfs2_ea_header_out (const struct gfs2_ea_header *ea,void *buf);