Remove gfs2_inode_attr_in [35/70]
Quoted 1 line
From
9e2dbdac3df300516ffdd9a8631f23164d068a50Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <[email protected]>
Date: Wed, 8 Nov 2006 15:45:46 -0500
Subject: [PATCH] [GFS2] Remove gfs2_inode_attr_in
This function wasn't really doing the right thing. There was no need to update the inode size at this point and the updating of the i_blocks field has now been moved to the places where di_blocks is updated. A result of this patch and some those preceeding it is that unlocking a glock is now a much more efficient process, since there is no longer any requirement to copy data from the gfs2 inode into the vfs inode at this point.
Signed-off-by Steven Whitehouse <[email protected]>
--- fs/gfs2/bmap.c | 4 ++++ fs/gfs2/dir.c | 4 ++++ fs/gfs2/eattr.c | 6 ++++++ fs/gfs2/glops.c | 8 ++------ fs/gfs2/inode.c | 21 +++------------------ fs/gfs2/inode.h | 7 +++++++ 6 files changed, 26 insertions(+), 24 deletions(-)
fs/gfs2/bmap.c +4 -0
@@ -163,6 +163,7 @@ int gfs2_unstuff_dinode(struct gfs2_inodif (ip->i_di.di_size) { *(__be64 *)(di +1 ) =cpu_to_be64 (block); ip->i_di.di_blocks++; +gfs2_set_inode_blocks (&ip->i_inode); di->di_blocks =cpu_to_be64 (ip->i_di.di_blocks); }
@@ -272,6 +273,7 @@ static int build_height(struct inode *in *(__be64 *)(di +1 ) =cpu_to_be64 (bn); ip->i_di.di_height += new_height; ip->i_di.di_blocks += new_height; +gfs2_set_inode_blocks (&ip->i_inode); di->di_height =cpu_to_be16 (ip->i_di.di_height); di->di_blocks =cpu_to_be64 (ip->i_di.di_blocks);brelse (dibh);
@@ -415,6 +417,7 @@ static int lookup_block(struct gfs2_inod *ptr =cpu_to_be64 (*block); ip->i_di.di_blocks++; +gfs2_set_inode_blocks (&ip->i_inode); *new =1 ;return 0 ;
@@ -770,6 +773,7 @@ static int do_strip(struct gfs2_inode *iif (!ip->i_di.di_blocks)gfs2_consist_inode (ip); ip->i_di.di_blocks--; +gfs2_set_inode_blocks (&ip->i_inode); }if (bstart) {if (metadata)
fs/gfs2/dir.c +4 -0
@@ -901,6 +901,7 @@ static int dir_make_exhash(struct inode dip->i_di.di_size = sdp->sd_sb.sb_bsize /2 ; dip->i_di.di_blocks++; +gfs2_set_inode_blocks (&dip->i_inode); dip->i_di.di_flags |=GFS2_DIF_EXHASH ;for (x = sdp->sd_hash_ptrs, y =-1 ; x; x >>=1 , y++) ;
@@ -1038,6 +1039,7 @@ static int dir_split_leaf(struct inode * error =gfs2_meta_inode_buffer (dip, &dibh);if (!gfs2_assert_withdraw (GFS2_SB (&dip->i_inode), !error)) { dip->i_di.di_blocks++; +gfs2_set_inode_blocks (&dip->i_inode);gfs2_dinode_out (dip, dibh->b_data);brelse (dibh); }
@@ -1516,6 +1518,7 @@ static int dir_new_leaf(struct inode *inreturn error;gfs2_trans_add_bh (ip->i_gl, bh,1 ); ip->i_di.di_blocks++; +gfs2_set_inode_blocks (&ip->i_inode);gfs2_dinode_out (ip, bh->b_data);brelse (bh);return 0 ;
@@ -1860,6 +1863,7 @@ static int leaf_dealloc(struct gfs2_inodif (!dip->i_di.di_blocks)gfs2_consist_inode (dip); dip->i_di.di_blocks--; +gfs2_set_inode_blocks (&dip->i_inode); } error =gfs2_dir_write_data (dip, ht, index *sizeof (u64), size);
fs/gfs2/eattr.c +6 -0
@@ -281,6 +281,7 @@ static int ea_dealloc_unstuffed(struct gif (!ip->i_di.di_blocks)gfs2_consist_inode (ip); ip->i_di.di_blocks--; +gfs2_set_inode_blocks (&ip->i_inode); }if (bstart)gfs2_free_meta (ip, bstart, blen);
@@ -598,6 +599,7 @@ static int ea_alloc_blk(struct gfs2_inod ea->ea_num_ptrs =0 ; ip->i_di.di_blocks++; +gfs2_set_inode_blocks (&ip->i_inode);return 0 ; }
@@ -649,6 +651,7 @@ static int ea_write(struct gfs2_inode *igfs2_metatype_set (bh,GFS2_METATYPE_ED ,GFS2_FORMAT_ED ); ip->i_di.di_blocks++; +gfs2_set_inode_blocks (&ip->i_inode); copy = data_len > sdp->sd_jbsize ? sdp->sd_jbsize : data_len;
@@ -977,6 +980,7 @@ static int ea_set_block(struct gfs2_inod ip->i_di.di_eattr = blk; ip->i_di.di_flags |=GFS2_DIF_EA_INDIRECT ; ip->i_di.di_blocks++; +gfs2_set_inode_blocks (&ip->i_inode); eablk++; }
@@ -1387,6 +1391,7 @@ static int ea_dealloc_indirect(struct gfif (!ip->i_di.di_blocks)gfs2_consist_inode (ip); ip->i_di.di_blocks--; +gfs2_set_inode_blocks (&ip->i_inode); }if (bstart)gfs2_free_meta (ip, bstart, blen);
@@ -1441,6 +1446,7 @@ static int ea_dealloc_block(struct gfs2_if (!ip->i_di.di_blocks)gfs2_consist_inode (ip); ip->i_di.di_blocks--; +gfs2_set_inode_blocks (&ip->i_inode); error =gfs2_meta_inode_buffer (ip, &dibh);if (!error) {
fs/gfs2/glops.c +2 -6
@@ -356,7 +356,6 @@ static int inode_go_lock(struct gfs2_hol error =gfs2_inode_refresh (ip);if (error)return error; -gfs2_inode_attr_in (ip); } if ((ip->i_di.di_flags & GFS2_DIF_TRUNC_IN_PROG) &&
@@ -380,11 +379,8 @@ static void inode_go_unlock(struct gfs2_struct gfs2_glock *gl = gh->gh_gl;struct gfs2_inode *ip = gl->gl_object; -if (ip ==NULL ) -return ; -if (test_bit (GLF_DIRTY , &gl->gl_flags)) -gfs2_inode_attr_in (ip); -gfs2_meta_cache_flush (ip); +if (ip) +gfs2_meta_cache_flush (ip); }/**
fs/gfs2/inode.c +3 -18
@@ -38,29 +38,12 @@ #include "rgrp.h"#include "trans.h" #include "util.h" -/** -* gfs2_inode_attr_in - Copy attributes from the dinode into the VFS inode -* @ip: The GFS2 inode (with embedded disk inode data) -* @inode: The Linux VFS inode -* -*/ - -void gfs2_inode_attr_in (struct gfs2_inode *ip) -{ -struct inode *inode = &ip->i_inode; -struct gfs2_dinode_host *di = &ip->i_di; - -i_size_write (inode, di->di_size); - inode->i_blocks = di->di_blocks << - (GFS2_SB (inode)->sd_sb.sb_bsize_shift -GFS2_BASIC_BLOCK_SHIFT ); -} -static int iget_test (struct inode *inode,void *opaque) {struct gfs2_inode *ip =GFS2_I (inode);struct gfs2_inum_host *inum = opaque; -if (ip && ip->i_num.no_addr == inum->no_addr) +if (ip->i_num.no_addr == inum->no_addr)return 1 ;return 0 ;
@@ -187,7 +170,9 @@ static int gfs2_dinode_in(struct gfs2_in*/ ip->i_inode.i_nlink =be32_to_cpu (str->di_nlink); di->di_size =be64_to_cpu (str->di_size); +i_size_write (&ip->i_inode, di->di_size); di->di_blocks =be64_to_cpu (str->di_blocks); +gfs2_set_inode_blocks (&ip->i_inode); ip->i_inode.i_atime.tv_sec =be64_to_cpu (str->di_atime); ip->i_inode.i_atime.tv_nsec =0 ; ip->i_inode.i_mtime.tv_sec =be64_to_cpu (str->di_mtime);
fs/gfs2/inode.h +7 -0
@@ -25,6 +25,13 @@ static inline int gfs2_is_dir(struct gfsreturn S_ISDIR (ip->i_inode.i_mode); } +static inline void gfs2_set_inode_blocks (struct inode *inode) +{ +struct gfs2_inode *ip =GFS2_I (inode); + inode->i_blocks = ip->i_di.di_blocks << + (GFS2_SB (inode)->sd_sb.sb_bsize_shift -GFS2_BASIC_BLOCK_SHIFT ); +} +void gfs2_inode_attr_in (struct gfs2_inode *ip);struct inode *gfs2_inode_lookup (struct super_block *sb,struct gfs2_inum_host *inum,unsigned type);struct inode *gfs2_ilookup (struct super_block *sb,struct gfs2_inum_host *inum);
Signature · 1 line
1.4.1