Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 67720
b: refs/heads/master
c: bddb8eb
h: refs/heads/master
v: v3
  • Loading branch information
Denis Cheng authored and Mark Fasheh committed Oct 12, 2007
1 parent 27013bf commit e618ea9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d550071c03f129a60dfad60d23dab73f894129a9
refs/heads/master: bddb8eb37f1460fc19e1af16010c9ad4ca3717a6
17 changes: 8 additions & 9 deletions trunk/fs/ocfs2/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ static int ocfs2_sync_fs(struct super_block *sb, int wait);

static int ocfs2_init_global_system_inodes(struct ocfs2_super *osb);
static int ocfs2_init_local_system_inodes(struct ocfs2_super *osb);
static int ocfs2_release_system_inodes(struct ocfs2_super *osb);
static void ocfs2_release_system_inodes(struct ocfs2_super *osb);
static int ocfs2_fill_local_node_info(struct ocfs2_super *osb);
static int ocfs2_check_volume(struct ocfs2_super *osb);
static int ocfs2_verify_volume(struct ocfs2_dinode *di,
Expand Down Expand Up @@ -180,7 +180,7 @@ static void ocfs2_write_super(struct super_block *sb)

static int ocfs2_sync_fs(struct super_block *sb, int wait)
{
int status = 0;
int status;
tid_t target;
struct ocfs2_super *osb = OCFS2_SB(sb);

Expand Down Expand Up @@ -278,9 +278,9 @@ static int ocfs2_init_local_system_inodes(struct ocfs2_super *osb)
return status;
}

static int ocfs2_release_system_inodes(struct ocfs2_super *osb)
static void ocfs2_release_system_inodes(struct ocfs2_super *osb)
{
int status = 0, i;
int i;
struct inode *inode;

mlog_entry_void();
Expand All @@ -305,8 +305,7 @@ static int ocfs2_release_system_inodes(struct ocfs2_super *osb)
osb->root_inode = NULL;
}

mlog_exit(status);
return status;
mlog_exit(0);
}

/* We're allocating fs objects, use GFP_NOFS */
Expand Down Expand Up @@ -456,7 +455,7 @@ static int ocfs2_sb_probe(struct super_block *sb,
struct buffer_head **bh,
int *sector_size)
{
int status = 0, tmpstat;
int status, tmpstat;
struct ocfs1_vol_disk_hdr *hdr;
struct ocfs2_dinode *di;
int blksize;
Expand Down Expand Up @@ -1314,7 +1313,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
struct buffer_head *bh,
int sector_size)
{
int status = 0;
int status;
int i, cbits, bbits;
struct ocfs2_dinode *di = (struct ocfs2_dinode *)bh->b_data;
struct inode *inode = NULL;
Expand Down Expand Up @@ -1635,7 +1634,7 @@ static int ocfs2_verify_volume(struct ocfs2_dinode *di,

static int ocfs2_check_volume(struct ocfs2_super *osb)
{
int status = 0;
int status;
int dirty;
int local;
struct ocfs2_dinode *local_alloc = NULL; /* only used if we
Expand Down

0 comments on commit e618ea9

Please sign in to comment.