iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[GFS2] Tidy up in various files

Browse Source 
Tidy up some files and remove an unused routine in meta_io.h. Also
added a bit of extra debugging in meta_io.h.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Steven Whitehouse 2006-07-31 15:42:17 -04:00
parent b1b934d31d
commit 420b9e5e45
3 changed files with 12 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/gfs2/inode.c
View File

@ -277,8 +277,7 @@ int gfs2_dinode_dealloc(struct gfs2_inode *ip)
if (error)
goto out_rindex_relse;
error = gfs2_trans_begin(sdp, RES_RG_BIT +
RES_STATFS + RES_QUOTA, 1);
error = gfs2_trans_begin(sdp, RES_RG_BIT + RES_STATFS + RES_QUOTA, 1);
if (error)
goto out_rg_gunlock;
@ -522,16 +521,13 @@ static int pick_formal_ino_2(struct gfs2_sbd *sdp, uint64_t *formal_ino)
gfs2_trans_add_bh(ip->i_gl, bh, 1);
gfs2_inum_range_out(&ir, bh->b_data + sizeof(struct gfs2_dinode));
out_brelse:
out_brelse:
brelse(bh);
out_end_trans:
out_end_trans:
mutex_unlock(&sdp->sd_inum_mutex);
gfs2_trans_end(sdp);
out:
out:
gfs2_glock_dq_uninit(&gh);
return error;
}
@ -593,8 +589,7 @@ static void munge_mode_uid_gid(struct gfs2_inode *dip, unsigned int *mode,
unsigned int *uid, unsigned int *gid)
{
if (GFS2_SB(&dip->i_inode)->sd_args.ar_suiddir &&
(dip->i_di.di_mode & S_ISUID) &&
dip->i_di.di_uid) {
(dip->i_di.di_mode & S_ISUID) && dip->i_di.di_uid) {
if (S_ISDIR(*mode))
*mode |= S_ISUID;
else if (dip->i_di.di_uid != current->fsuid)
@ -634,10 +629,8 @@ static int alloc_dinode(struct gfs2_inode *dip, struct gfs2_inum *inum,
out_ipreserv:
gfs2_inplace_release(dip);
out:
gfs2_alloc_put(dip);
return error;
}
@ -1300,7 +1293,6 @@ int gfs2_glock_nq_m_atime(unsigned int num_gh, struct gfs2_holder *ghs)
}
kfree(p);
return error;
}
@ -1346,9 +1338,7 @@ int gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr)
return error;
error = __gfs2_setattr_simple(ip, attr);
gfs2_trans_end(GFS2_SB(&ip->i_inode));
return error;
}

23
fs/gfs2/meta_io.h
View File

@ -17,35 +17,20 @@ static inline void gfs2_buffer_clear(struct buffer_head *bh)
static inline void gfs2_buffer_clear_tail(struct buffer_head *bh, int head)
{
BUG_ON(head > bh->b_size);
memset(bh->b_data + head, 0, bh->b_size - head);
}
static inline void gfs2_buffer_clear_ends(struct buffer_head *bh, int offset,
int amount, int journaled)
{
int z_off1 = (journaled) ? sizeof(struct gfs2_meta_header) : 0;
int z_len1 = offset - z_off1;
int z_off2 = offset + amount;
int z_len2 = (bh)->b_size - z_off2;
if (z_len1)
memset(bh->b_data + z_off1, 0, z_len1);
if (z_len2)
memset(bh->b_data + z_off2, 0, z_len2);
}
static inline void gfs2_buffer_copy_tail(struct buffer_head *to_bh,
int to_head,
struct buffer_head *from_bh,
int from_head)
{
memcpy(to_bh->b_data + to_head,
from_bh->b_data + from_head,
BUG_ON(from_head < to_head);
memcpy(to_bh->b_data + to_head, from_bh->b_data + from_head,
from_bh->b_size - from_head);
memset(to_bh->b_data + to_bh->b_size + to_head - from_head,
0,
from_head - to_head);
0, from_head - to_head);
}
struct inode *gfs2_aspace_get(struct gfs2_sbd *sdp);

9
fs/gfs2/ops_file.c
View File

@ -597,13 +597,11 @@ static int gfs2_open(struct inode *inode, struct file *file)
return 0;
fail_gunlock:
fail_gunlock:
gfs2_glock_dq_uninit(&i_gh);
fail:
fail:
file->private_data = NULL;
kfree(fp);
return error;
}
@ -736,9 +734,8 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)
gfs2_assert_warn(GFS2_SB(&ip->i_inode), !error);
}
out:
out:
mutex_unlock(&fp->f_fl_mutex);
return error;
}