Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GFS2] Move gfs2_dinode_in to inode.c

Browse source 
gfs2_dinode_in() is only ever called from one place, so move it
to that place (in inode.c) and make it static.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Steven Whitehouse 2006-10-31 15:28:00 -05:00
parent 891ea14712
commit ea744d01c6
3 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
fs/gfs2/inode.c
View file

@ -208,6 +208,40 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum_host *i
return ERR_PTR(error); return ERR_PTR(error);
} }
static 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);
gfs2_inum_in(&di->di_num, &str->di_num);
di->di_mode = be32_to_cpu(str->di_mode);
di->di_uid = be32_to_cpu(str->di_uid);
di->di_gid = be32_to_cpu(str->di_gid);
di->di_nlink = be32_to_cpu(str->di_nlink);
di->di_size = be64_to_cpu(str->di_size);
di->di_blocks = be64_to_cpu(str->di_blocks);
di->di_atime = be64_to_cpu(str->di_atime);
di->di_mtime = be64_to_cpu(str->di_mtime);
di->di_ctime = be64_to_cpu(str->di_ctime);
di->di_major = be32_to_cpu(str->di_major);
di->di_minor = be32_to_cpu(str->di_minor);
di->di_goal_meta = be64_to_cpu(str->di_goal_meta);
di->di_goal_data = be64_to_cpu(str->di_goal_data);
di->di_generation = be64_to_cpu(str->di_generation);
di->di_flags = be32_to_cpu(str->di_flags);
di->di_payload_format = be32_to_cpu(str->di_payload_format);
di->di_height = be16_to_cpu(str->di_height);
di->di_depth = be16_to_cpu(str->di_depth);
di->di_entries = be32_to_cpu(str->di_entries);
di->di_eattr = be64_to_cpu(str->di_eattr);
}
/** /**
* gfs2_inode_refresh - Refresh the incore copy of the dinode * gfs2_inode_refresh - Refresh the incore copy of the dinode
* @ip: The GFS2 inode * @ip: The GFS2 inode

36
fs/gfs2/ondisk.c
View file

@ -56,7 +56,7 @@ static void gfs2_inum_print(const struct gfs2_inum_host *no)
printk(KERN_INFO " no_addr = %llu\n", (unsigned long long)no->no_addr); printk(KERN_INFO " no_addr = %llu\n", (unsigned long long)no->no_addr);
} }
static void gfs2_meta_header_in(struct gfs2_meta_header_host *mh, const void *buf) void gfs2_meta_header_in(struct gfs2_meta_header_host *mh, const void *buf)
{ {
const struct gfs2_meta_header *str = buf; const struct gfs2_meta_header *str = buf;
@ -155,40 +155,6 @@ void gfs2_quota_in(struct gfs2_quota_host *qu, const void *buf)
qu->qu_value = be64_to_cpu(str->qu_value); qu->qu_value = be64_to_cpu(str->qu_value);
} }
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);
gfs2_inum_in(&di->di_num, &str->di_num);
di->di_mode = be32_to_cpu(str->di_mode);
di->di_uid = be32_to_cpu(str->di_uid);
di->di_gid = be32_to_cpu(str->di_gid);
di->di_nlink = be32_to_cpu(str->di_nlink);
di->di_size = be64_to_cpu(str->di_size);
di->di_blocks = be64_to_cpu(str->di_blocks);
di->di_atime = be64_to_cpu(str->di_atime);
di->di_mtime = be64_to_cpu(str->di_mtime);
di->di_ctime = be64_to_cpu(str->di_ctime);
di->di_major = be32_to_cpu(str->di_major);
di->di_minor = be32_to_cpu(str->di_minor);
di->di_goal_meta = be64_to_cpu(str->di_goal_meta);
di->di_goal_data = be64_to_cpu(str->di_goal_data);
di->di_generation = be64_to_cpu(str->di_generation);
di->di_flags = be32_to_cpu(str->di_flags);
di->di_payload_format = be32_to_cpu(str->di_payload_format);
di->di_height = be16_to_cpu(str->di_height);
di->di_depth = be16_to_cpu(str->di_depth);
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) void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf)
{ {
const struct gfs2_dinode_host *di = &ip->i_di; const struct gfs2_dinode_host *di = &ip->i_di;

2
include/linux/gfs2_ondisk.h
View file

@ -528,6 +528,7 @@ struct gfs2_quota_change_host {
extern void gfs2_inum_in(struct gfs2_inum_host *no, const void *buf); extern void gfs2_inum_in(struct gfs2_inum_host *no, const void *buf);
extern void gfs2_inum_out(const struct gfs2_inum_host *no, void *buf); extern void gfs2_inum_out(const struct gfs2_inum_host *no, void *buf);
extern void gfs2_meta_header_in(struct gfs2_meta_header_host *mh, const void *buf);
extern void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf); extern void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf);
extern void gfs2_rindex_in(struct gfs2_rindex_host *ri, const void *buf); extern void gfs2_rindex_in(struct gfs2_rindex_host *ri, const void *buf);
extern void gfs2_rindex_out(const struct gfs2_rindex_host *ri, void *buf); extern void gfs2_rindex_out(const struct gfs2_rindex_host *ri, void *buf);
@ -535,7 +536,6 @@ extern 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_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_quota_in(struct gfs2_quota_host *qu, const void *buf);
struct gfs2_inode; 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_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_in(struct gfs2_ea_header *ea, const void *buf);
extern void gfs2_ea_header_out(const struct gfs2_ea_header *ea, void *buf); extern void gfs2_ea_header_out(const struct gfs2_ea_header *ea, void *buf);