GFS2: Pre-pull patch posting (merge window)
Hi,
Not a huge amount this time... just four patches. This time we have a couple of bug fixes, one relating to bad i_goal values which are now ignored (i_goal is basically a hint so it is safe to so this) and another relating to the saving of the dirent location during rename. There is one performance improvement, which is an optimisation in rgblk_free so that multiple block deallocations will now be more efficient, and one clean up patch to use _RET_IP_ rather than writing it out longhand,
Steve.
PATCH 1/4 GFS2: fix bad inode i_goal values during block allocation
From: Abhi Das <[email protected]>
This patch checks if i_goal is either zero or if doesn't exist within any rgrp (i.e gfs2_blk2rgrpd() returns NULL). If so, it assigns the ip->i_no_addr block as the i_goal.
There are two scenarios where a bad i_goal can result in a -EBADSLT error.
1. Attempting to allocate to an existing inode:
Control reaches gfs2_inplace_reserve() and ip->i_goal is bad. We need to fix i_goal here.
2. A new inode is created in a directory whose i_goal is hosed:
In this case, the parent dir's i_goal is copied onto the new inode. Since the new inode is not yet created, the ip->i_no_addr field is invalid and so, the fix in gfs2_inplace_reserve() as per
1) won't work in this scenario. We need to catch and fix it sooner in the parent dir itself (gfs2_create_inode()), before it is copied to the new inode.
fs/gfs2/inode.c +1 -0
@@ -672,6 +672,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry, inode->i_atime = inode->i_mtime = inode->i_ctime =CURRENT_TIME ;gfs2_set_inode_blocks (inode,1 );munge_mode_uid_gid (dip, inode); +check_and_update_goal (dip); ip->i_goal = dip->i_goal; ip->i_diskflags =0 ; ip->i_eattr =0 ;
fs/gfs2/rgrp.c +8 -0
@@ -577,6 +577,13 @@ struct gfs2_rgrpd *gfs2_rgrpd_get_next(struct gfs2_rgrpd *rgd)return rgd; } +void check_and_update_goal (struct gfs2_inode *ip) +{ +struct gfs2_sbd *sdp =GFS2_SB (&ip->i_inode); +if (!ip->i_goal ||gfs2_blk2rgrpd (sdp, ip->i_goal,1 ) ==NULL ) + ip->i_goal = ip->i_no_addr; +} +void gfs2_free_clones (struct gfs2_rgrpd *rgd) {int x;
@@ -1910,6 +1917,7 @@ int gfs2_inplace_reserve(struct gfs2_inode *ip, const struct gfs2_alloc_parms *a }else if (ip->i_rgd &&rgrp_contains_block (ip->i_rgd, ip->i_goal)) { rs->rs_rbm.rgd = begin = ip->i_rgd; }else { +check_and_update_goal (ip); rs->rs_rbm.rgd = begin =gfs2_blk2rgrpd (sdp, ip->i_goal,1 ); }if (S_ISDIR (ip->i_inode.i_mode) && (ap->aflags &GFS2_AF_ORLOV ))
fs/gfs2/rgrp.h +1 -0
@@ -80,4 +80,5 @@ static inline bool gfs2_rs_active(struct gfs2_blkreserv *rs) return rs && !RB_EMPTY_NODE(&rs->rs_node); } +extern void check_and_update_goal (struct gfs2_inode *ip);#endif /* __RGRP_DOT_H__ */
Signature · 1 line
1.8.3.1
PATCH 2/4 GFS2: Make rename not save dirent location
In reply to Steven WhitehouseFrom: Bob Peterson <[email protected]>
This patch fixes a regression in the patch "GFS2: Remember directory insert point", commit 2b47dad866d04f14c328f888ba5406057b8c7d33. The problem had to do with the rename function: The function found space for the new dirent, and remembered that location. But then the old dirent was removed, which often moved the eligible location for the renamed dirent. Putting the new dirent at the saved location caused file system corruption.
This patch adds a new "save_loc" variable to struct gfs2_diradd. If 1, the dirent location is saved. If 0, the dirent location is not saved and the buffer_head is released as per previous behavior.
fs/gfs2/dir.c +7 -2
@@ -2100,8 +2100,13 @@ int gfs2_diradd_alloc_required(struct inode *inode, const struct qstr *name, }if (IS_ERR (dent))return PTR_ERR (dent); - da->bh = bh; - da->dent = dent; + +if (da->save_loc) { + da->bh = bh; + da->dent = dent; + }else { +brelse (bh); + }return 0 ; }
fs/gfs2/dir.h +1 -0
@@ -23,6 +23,7 @@ struct gfs2_diradd {unsigned nr_blocks;struct gfs2_dirent *dent;struct buffer_head *bh; +int save_loc; }; extern struct inode *gfs2_dir_search(struct inode *dir,
fs/gfs2/inode.c +3 -3
@@ -600,7 +600,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,int error, free_vfs_inode =0 ;u32 aflags =0 ;unsigned blocks =1 ; -struct gfs2_diradd da = { .bh =NULL , }; +struct gfs2_diradd da = { .bh =NULL , .save_loc =1 , };if (!name->len || name->len >GFS2_FNAMESIZE )return -ENAMETOOLONG ;
@@ -900,7 +900,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,struct gfs2_inode *ip =GFS2_I (inode);struct gfs2_holder ghs[2 ];struct buffer_head *dibh; -struct gfs2_diradd da = { .bh =NULL , }; +struct gfs2_diradd da = { .bh =NULL , .save_loc =1 , };int error;if (S_ISDIR (inode->i_mode))
@@ -1338,7 +1338,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,struct gfs2_rgrpd *nrgd;unsigned int num_gh;int dir_rename =0 ; -struct gfs2_diradd da = { .nr_blocks =0 , }; +struct gfs2_diradd da = { .nr_blocks =0 , .save_loc =0 , };unsigned int x;int error;
Signature · 1 line
1.8.3.1
PATCH 3/4 GFS2: Use gfs2_rbm_incr in rgblk_free
In reply to Steven WhitehouseFrom: Bob Peterson <[email protected]>
This patch speeds up GFS2 unlink operations by using function gfs2_rbm_incr rather than continuously calculating the rbm.
fs/gfs2/rgrp.c +13 -9
@@ -2097,7 +2097,7 @@ static struct gfs2_rgrpd *rgblk_free(struct gfs2_sbd *sdp, u64 bstart, u32 blen, unsigned char new_state) { struct gfs2_rbm rbm; -struct gfs2_bitmap *bi; +struct gfs2_bitmap *bi, *bi_prev =NULL ; rbm.rgd =gfs2_blk2rgrpd (sdp, bstart,1 );if (!rbm.rgd) {
@@ -2106,18 +2106,22 @@ static struct gfs2_rgrpd *rgblk_free(struct gfs2_sbd *sdp, u64 bstart,return NULL ; } +gfs2_rbm_from_block (&rbm, bstart);while (blen--) { -gfs2_rbm_from_block (&rbm, bstart); bi =rbm_bi (&rbm); - bstart++; -if (!bi->bi_clone) { - bi->bi_clone =kmalloc (bi->bi_bh->b_size, -GFP_NOFS | __GFP_NOFAIL); -memcpy (bi->bi_clone + bi->bi_offset, - bi->bi_bh->b_data + bi->bi_offset, bi->bi_len); +if (bi != bi_prev) { +if (!bi->bi_clone) { + bi->bi_clone =kmalloc (bi->bi_bh->b_size, +GFP_NOFS | __GFP_NOFAIL); +memcpy (bi->bi_clone + bi->bi_offset, + bi->bi_bh->b_data + bi->bi_offset, + bi->bi_len); + } +gfs2_trans_add_meta (rbm.rgd->rd_gl, bi->bi_bh); + bi_prev = bi; } -gfs2_trans_add_meta (rbm.rgd->rd_gl, bi->bi_bh);gfs2_setbit (&rbm, false, new_state); +gfs2_rbm_incr (&rbm); }return rbm.rgd;
Signature · 1 line
1.8.3.1
PATCH 4/4 GFS2: use _RET_IP_ instead of (unsigned long)__builtin_return_address(0)
In reply to Steven WhitehouseFrom: Fabian Frederick <[email protected]>
use macro definition
fs/gfs2/glock.c +2 -2
@@ -811,7 +811,7 @@ void gfs2_holder_init(struct gfs2_glock *gl, unsigned int state, unsigned flags, {INIT_LIST_HEAD (&gh->gh_list); gh->gh_gl = gl; - gh->gh_ip = (unsigned long )__builtin_return_address (0 ); + gh->gh_ip = _RET_IP_; gh->gh_owner_pid =get_pid (task_pid (current)); gh->gh_state = state; gh->gh_flags = flags;
@@ -835,7 +835,7 @@ void gfs2_holder_reinit(unsigned int state, unsigned flags, struct gfs2_holder * gh->gh_state = state; gh->gh_flags = flags; gh->gh_iflags =0 ; - gh->gh_ip = (unsigned long )__builtin_return_address (0 ); + gh->gh_ip = _RET_IP_;if (gh->gh_owner_pid)put_pid (gh->gh_owner_pid); gh->gh_owner_pid =get_pid (task_pid (current));
fs/gfs2/glops.c +1 -1
@@ -93,7 +93,7 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl)* tr->alloced is not set since the transaction structure is * on the stack */ tr.tr_reserved =1 +gfs2_struct2blk (sdp, tr.tr_revokes,sizeof (u64)); - tr.tr_ip = (unsigned long )__builtin_return_address (0 ); + tr.tr_ip = _RET_IP_;sb_start_intwrite (sdp->sd_vfs);if (gfs2_log_reserve (sdp, tr.tr_reserved) <0 ) {sb_end_intwrite (sdp->sd_vfs);
fs/gfs2/trans.c +1 -1
@@ -44,7 +44,7 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,if (!tr)return -ENOMEM ; - tr->tr_ip = (unsigned long )__builtin_return_address (0 ); + tr->tr_ip = _RET_IP_; tr->tr_blocks = blocks; tr->tr_revokes = revokes; tr->tr_reserved =1 ;
Signature · 1 line
1.8.3.1