Re: [Cluster-devel] [Patch 01/44] fsck.gfs2: Make functions consistently use sdp rather than sbp
Hi,
ACK. I'd suggest to get things like this pushed asap since they are
trivial and will reduce the size of the remaining patch set,
Steve.
On Thu, 2011-08-11 at 16:52 -0400, Bob Peterson wrote:
From f4326def0744e6a01a5e7665eb4f8261d6996af7 Mon Sep 17 00:00:00 2001
From: Bob Peterson rpete...@redhat.com
Date: Mon, 8 Aug 2011 08:41:36 -0500
Subject: [PATCH 01/44] fsck.gfs2: Make functions consistently use sdp rather
than sbp
For years, the fsck.gfs2 tool used two different variable names to refer to
the
same structure: sdp and sbp. This patch changes them all to sdp so they are
now
consistent with the kernel code.
rhbz#675723
---
gfs2/fsck/fsck.h | 20 ++--
gfs2/fsck/initialize.c | 84
gfs2/fsck/main.c | 48 ++--
gfs2/fsck/metawalk.c | 24 +++---
gfs2/fsck/metawalk.h |4 +-
gfs2/fsck/pass1.c | 18 +-
gfs2/fsck/pass1b.c | 34 ++--
gfs2/fsck/pass1c.c | 26 +++---
gfs2/fsck/pass2.c | 58
gfs2/fsck/pass3.c | 28
gfs2/fsck/pass4.c | 14
gfs2/fsck/pass5.c | 16
12 files changed, 187 insertions(+), 187 deletions(-)
diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h
index bc14b88..25bc3b9 100644
--- a/gfs2/fsck/fsck.h
+++ b/gfs2/fsck/fsck.h
@@ -92,21 +92,21 @@ enum rgindex_trust_level { /* how far can we trust our RG
index? */
must have been converted from gfs2_convert. */
};
-extern struct gfs2_inode *fsck_load_inode(struct gfs2_sbd *sbp, uint64_t
block);
+extern struct gfs2_inode *fsck_load_inode(struct gfs2_sbd *sdp, uint64_t
block);
extern struct gfs2_inode *fsck_inode_get(struct gfs2_sbd *sdp,
struct gfs2_buffer_head *bh);
extern void fsck_inode_put(struct gfs2_inode **ip);
-extern int initialize(struct gfs2_sbd *sbp, int force_check, int preen,
+extern int initialize(struct gfs2_sbd *sdp, int force_check, int preen,
int *all_clean);
-extern void destroy(struct gfs2_sbd *sbp);
-extern int pass1(struct gfs2_sbd *sbp);
-extern int pass1b(struct gfs2_sbd *sbp);
-extern int pass1c(struct gfs2_sbd *sbp);
-extern int pass2(struct gfs2_sbd *sbp);
-extern int pass3(struct gfs2_sbd *sbp);
-extern int pass4(struct gfs2_sbd *sbp);
-extern int pass5(struct gfs2_sbd *sbp);
+extern void destroy(struct gfs2_sbd *sdp);
+extern int pass1(struct gfs2_sbd *sdp);
+extern int pass1b(struct gfs2_sbd *sdp);
+extern int pass1c(struct gfs2_sbd *sdp);
+extern int pass2(struct gfs2_sbd *sdp);
+extern int pass3(struct gfs2_sbd *sdp);
+extern int pass4(struct gfs2_sbd *sdp);
+extern int pass5(struct gfs2_sbd *sdp);
extern int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count,
int *sane);
extern void gfs2_dup_free(void);
diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c
index 0930ba6..55a4f19 100644
--- a/gfs2/fsck/initialize.c
+++ b/gfs2/fsck/initialize.c
@@ -38,26 +38,26 @@ static struct master_dir fix_md;
* Change the lock protocol so nobody can mount the fs
*
*/
-static int block_mounters(struct gfs2_sbd *sbp, int block_em)
+static int block_mounters(struct gfs2_sbd *sdp, int block_em)
{
if(block_em) {
/* verify it starts with lock_ */
- if(!strncmp(sbp-sd_sb.sb_lockproto, lock_, 5)) {
+ if(!strncmp(sdp-sd_sb.sb_lockproto, lock_, 5)) {
/* Change lock_ to fsck_ */
- memcpy(sbp-sd_sb.sb_lockproto, fsck_, 5);
+ memcpy(sdp-sd_sb.sb_lockproto, fsck_, 5);
}
/* FIXME: Need to do other verification in the else
* case */
} else {
/* verify it starts with fsck_ */
/* verify it starts with lock_ */
- if(!strncmp(sbp-sd_sb.sb_lockproto, fsck_, 5)) {
+ if(!strncmp(sdp-sd_sb.sb_lockproto, fsck_, 5)) {
/* Change fsck_ to lock_ */
- memcpy(sbp-sd_sb.sb_lockproto, lock_, 5);
+ memcpy(sdp-sd_sb.sb_lockproto, lock_, 5);
}
}
- if(write_sb(sbp)) {
+ if(write_sb(sdp)) {
stack;
return -1;
}
@@ -1180,7 +1180,7 @@ static int fill_super_block(struct gfs2_sbd *sdp)
* initialize - initialize superblock pointer
*
*/
-int initialize(struct gfs2_sbd *sbp, int force_check, int preen,
+int initialize(struct gfs2_sbd *sdp, int force_check, int preen,
int *all_clean)
{
int clean_journals = 0, open_flag;
@@ -1192,8 +1192,8 @@ int initialize(struct gfs2_sbd *sbp, int force_check,
int preen,
else
open_flag = O_RDWR | O_EXCL;
- sbp-device_fd = open(opts.device, open_flag);
[Cluster-devel] [Patch 01/44] fsck.gfs2: Make functions consistently use sdp rather than sbp
From f4326def0744e6a01a5e7665eb4f8261d6996af7 Mon Sep 17 00:00:00 2001
From: Bob Peterson rpete...@redhat.com
Date: Mon, 8 Aug 2011 08:41:36 -0500
Subject: [PATCH 01/44] fsck.gfs2: Make functions consistently use sdp rather
than sbp
For years, the fsck.gfs2 tool used two different variable names to refer to the
same structure: sdp and sbp. This patch changes them all to sdp so they are now
consistent with the kernel code.
rhbz#675723
---
gfs2/fsck/fsck.h | 20 ++--
gfs2/fsck/initialize.c | 84
gfs2/fsck/main.c | 48 ++--
gfs2/fsck/metawalk.c | 24 +++---
gfs2/fsck/metawalk.h |4 +-
gfs2/fsck/pass1.c | 18 +-
gfs2/fsck/pass1b.c | 34 ++--
gfs2/fsck/pass1c.c | 26 +++---
gfs2/fsck/pass2.c | 58
gfs2/fsck/pass3.c | 28
gfs2/fsck/pass4.c | 14
gfs2/fsck/pass5.c | 16
12 files changed, 187 insertions(+), 187 deletions(-)
diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h
index bc14b88..25bc3b9 100644
--- a/gfs2/fsck/fsck.h
+++ b/gfs2/fsck/fsck.h
@@ -92,21 +92,21 @@ enum rgindex_trust_level { /* how far can we trust our RG
index? */
must have been converted from gfs2_convert. */
};
-extern struct gfs2_inode *fsck_load_inode(struct gfs2_sbd *sbp, uint64_t
block);
+extern struct gfs2_inode *fsck_load_inode(struct gfs2_sbd *sdp, uint64_t
block);
extern struct gfs2_inode *fsck_inode_get(struct gfs2_sbd *sdp,
struct gfs2_buffer_head *bh);
extern void fsck_inode_put(struct gfs2_inode **ip);
-extern int initialize(struct gfs2_sbd *sbp, int force_check, int preen,
+extern int initialize(struct gfs2_sbd *sdp, int force_check, int preen,
int *all_clean);
-extern void destroy(struct gfs2_sbd *sbp);
-extern int pass1(struct gfs2_sbd *sbp);
-extern int pass1b(struct gfs2_sbd *sbp);
-extern int pass1c(struct gfs2_sbd *sbp);
-extern int pass2(struct gfs2_sbd *sbp);
-extern int pass3(struct gfs2_sbd *sbp);
-extern int pass4(struct gfs2_sbd *sbp);
-extern int pass5(struct gfs2_sbd *sbp);
+extern void destroy(struct gfs2_sbd *sdp);
+extern int pass1(struct gfs2_sbd *sdp);
+extern int pass1b(struct gfs2_sbd *sdp);
+extern int pass1c(struct gfs2_sbd *sdp);
+extern int pass2(struct gfs2_sbd *sdp);
+extern int pass3(struct gfs2_sbd *sdp);
+extern int pass4(struct gfs2_sbd *sdp);
+extern int pass5(struct gfs2_sbd *sdp);
extern int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count,
int *sane);
extern void gfs2_dup_free(void);
diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c
index 0930ba6..55a4f19 100644
--- a/gfs2/fsck/initialize.c
+++ b/gfs2/fsck/initialize.c
@@ -38,26 +38,26 @@ static struct master_dir fix_md;
* Change the lock protocol so nobody can mount the fs
*
*/
-static int block_mounters(struct gfs2_sbd *sbp, int block_em)
+static int block_mounters(struct gfs2_sbd *sdp, int block_em)
{
if(block_em) {
/* verify it starts with lock_ */
- if(!strncmp(sbp-sd_sb.sb_lockproto, lock_, 5)) {
+ if(!strncmp(sdp-sd_sb.sb_lockproto, lock_, 5)) {
/* Change lock_ to fsck_ */
- memcpy(sbp-sd_sb.sb_lockproto, fsck_, 5);
+ memcpy(sdp-sd_sb.sb_lockproto, fsck_, 5);
}
/* FIXME: Need to do other verification in the else
* case */
} else {
/* verify it starts with fsck_ */
/* verify it starts with lock_ */
- if(!strncmp(sbp-sd_sb.sb_lockproto, fsck_, 5)) {
+ if(!strncmp(sdp-sd_sb.sb_lockproto, fsck_, 5)) {
/* Change fsck_ to lock_ */
- memcpy(sbp-sd_sb.sb_lockproto, lock_, 5);
+ memcpy(sdp-sd_sb.sb_lockproto, lock_, 5);
}
}
- if(write_sb(sbp)) {
+ if(write_sb(sdp)) {
stack;
return -1;
}
@@ -1180,7 +1180,7 @@ static int fill_super_block(struct gfs2_sbd *sdp)
* initialize - initialize superblock pointer
*
*/
-int initialize(struct gfs2_sbd *sbp, int force_check, int preen,
+int initialize(struct gfs2_sbd *sdp, int force_check, int preen,
int *all_clean)
{
int clean_journals = 0, open_flag;
@@ -1192,8 +1192,8 @@ int initialize(struct gfs2_sbd *sbp, int force_check, int
preen,
else
open_flag = O_RDWR | O_EXCL;
- sbp-device_fd = open(opts.device, open_flag);
- if (sbp-device_fd 0) {
+ sdp-device_fd = open(opts.device, open_flag);
+ if (sdp-device_fd 0) {
int is_mounted, ro;
if (open_flag == O_RDONLY || errno != EBUSY) {
@@ -1207,10 +1207,10 @@ int
