From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7710 invoked by alias); 11 May 2009 08:10:57 -0000 Received: (qmail 7657 invoked by alias); 11 May 2009 08:10:54 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: gfs2-utils: master - gfs2: sync gfs_ondisk.h from gfs1-utils To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: gfs2-utils.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 3b879381972672e17bfb286bfee30d9ca2c3c12a X-Git-Newrev: c8425dc66b4fa94b512b66805e1dee1e73bb0551 From: "Fabio M. Di Nitto" Message-Id: <20090511081026.E58FC120373@lists.fedorahosted.org> Date: Mon, 11 May 2009 08:10:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00242.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=c8425dc66b4fa94b512b66805e1dee1e73bb0551 Commit: c8425dc66b4fa94b512b66805e1dee1e73bb0551 Parent: 3b879381972672e17bfb286bfee30d9ca2c3c12a Author: Fabio M. Di Nitto AuthorDate: Mon May 11 10:10:09 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Mon May 11 10:10:09 2009 +0200 gfs2: sync gfs_ondisk.h from gfs1-utils Signed-off-by: Fabio M. Di Nitto --- gfs2/mount/gfs_ondisk.h | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gfs2/mount/gfs_ondisk.h b/gfs2/mount/gfs_ondisk.h index 0648d28..eea9038 100644 --- a/gfs2/mount/gfs_ondisk.h +++ b/gfs2/mount/gfs_ondisk.h @@ -695,7 +695,7 @@ void gfs_rgrp_print(struct gfs_rgrp *rgrp); void gfs_quota_print(struct gfs_quota *quota); void gfs_dinode_print(struct gfs_dinode *dinode); void gfs_indirect_print(struct gfs_indirect *indirect); -void gfs_dirent_print(struct gfs_dirent *dirent, char *name); +void gfs_dirent_print(struct gfs_dirent *dirent, const char *name); void gfs_leaf_print(struct gfs_leaf *leaf); void gfs_log_header_print(struct gfs_log_header *head); void gfs_desc_print(struct gfs_log_descriptor *desc); @@ -733,7 +733,7 @@ uint32_t gfs_dir_hash(const char *data, int len); */ static void -print_array(char *title, char *buf, int count) +print_array(const char *title, char *buf, int count) { int x; @@ -1016,20 +1016,20 @@ gfs_jindex_print(struct gfs_jindex *ji) */ void -gfs_rindex_in(struct gfs_rindex *rindex, char *buf) +gfs_rindex_in(struct gfs_rindex *grindex, char *buf) { struct gfs_rindex *str = (struct gfs_rindex *)buf; - CPIN_64(rindex, str, ri_addr); - CPIN_32(rindex, str, ri_length); - CPIN_32(rindex, str, ri_pad); + CPIN_64(grindex, str, ri_addr); + CPIN_32(grindex, str, ri_length); + CPIN_32(grindex, str, ri_pad); - CPIN_64(rindex, str, ri_data1); - CPIN_32(rindex, str, ri_data); + CPIN_64(grindex, str, ri_data1); + CPIN_32(grindex, str, ri_data); - CPIN_32(rindex, str, ri_bitbytes); + CPIN_32(grindex, str, ri_bitbytes); - CPIN_08(rindex, str, ri_reserved, 64); + CPIN_08(grindex, str, ri_reserved, 64); } /** @@ -1040,20 +1040,20 @@ gfs_rindex_in(struct gfs_rindex *rindex, char *buf) */ void -gfs_rindex_out(struct gfs_rindex *rindex, char *buf) +gfs_rindex_out(struct gfs_rindex *grindex, char *buf) { struct gfs_rindex *str = (struct gfs_rindex *)buf; - CPOUT_64(rindex, str, ri_addr); - CPOUT_32(rindex, str, ri_length); - CPOUT_32(rindex, str, ri_pad); + CPOUT_64(grindex, str, ri_addr); + CPOUT_32(grindex, str, ri_length); + CPOUT_32(grindex, str, ri_pad); - CPOUT_64(rindex, str, ri_data1); - CPOUT_32(rindex, str, ri_data); + CPOUT_64(grindex, str, ri_data1); + CPOUT_32(grindex, str, ri_data); - CPOUT_32(rindex, str, ri_bitbytes); + CPOUT_32(grindex, str, ri_bitbytes); - CPOUT_08(rindex, str, ri_reserved, 64); + CPOUT_08(grindex, str, ri_reserved, 64); } /** @@ -1454,7 +1454,7 @@ gfs_dirent_out(struct gfs_dirent *dirent, char *buf) */ void -gfs_dirent_print(struct gfs_dirent *de, char *name) +gfs_dirent_print(struct gfs_dirent *de, const char *name) { char buf[GFS_FNAMESIZE + 1];