GFS2: Pre-pull patch posting
This time we have mostly clean ups. There is a bug fix for a NULL dereference relating to ACLs, and another which improves (but does not fix entirely) an allocation fall-back code path. The other three patches are small clean ups.
Steve.
PATCH 1/5 GFS2: Eliminate __gfs2_glock_remove_from_lru
From: Bob Peterson <[email protected]>
Since the only caller of function __gfs2_glock_remove_from_lru locks the same spin_lock as gfs2_glock_remove_from_lru, the functions can be combined.
fs/gfs2/glock.c +3 -10
@@ -173,19 +173,14 @@ void gfs2_glock_add_to_lru(struct gfs2_glock *gl)spin_unlock (&lru_lock); } -static void __gfs2_glock_remove_from_lru (struct gfs2_glock *gl) +static void gfs2_glock_remove_from_lru (struct gfs2_glock *gl) { +spin_lock (&lru_lock);if (!list_empty (&gl->gl_lru)) {list_del_init (&gl->gl_lru);atomic_dec (&lru_count);clear_bit (GLF_LRU , &gl->gl_flags); } -} - -static void gfs2_glock_remove_from_lru (struct gfs2_glock *gl) -{ -spin_lock (&lru_lock); -__gfs2_glock_remove_from_lru (gl);spin_unlock (&lru_lock); }
@@ -205,9 +200,7 @@ void gfs2_glock_put(struct gfs2_glock *gl)lockref_mark_dead (&gl->gl_lockref); -spin_lock (&lru_lock); -__gfs2_glock_remove_from_lru (gl); -spin_unlock (&lru_lock); +gfs2_glock_remove_from_lru (gl);spin_unlock (&gl->gl_lockref.lock);spin_lock_bucket (gl->gl_hash);hlist_bl_del_rcu (&gl->gl_list);
Signature · 1 line
1.8.3.1
PATCH 2/5 GFS2: fix sprintf format specifier
In reply to Steven WhitehouseFrom: alex chen <[email protected]>
Sprintf format specifier "%d" and "%u" are mixed up in gfs2_recovery_done() and freeze_show(). So correct them.
fs/gfs2/recovery.c +1 -1
@@ -439,7 +439,7 @@ static void gfs2_recovery_done(struct gfs2_sbd *sdp, unsigned int jid, ls->ls_recover_jid_done = jid; ls->ls_recover_jid_status = message; -sprintf (env_jid,"JID=%d" , jid); +sprintf (env_jid,"JID=%u" , jid);sprintf (env_status,"RECOVERY=%s" , message ==LM_RD_SUCCESS ?"Done" :"Failed" );kobject_uevent_env (&sdp->sd_kobj,KOBJ_CHANGE , envp);
fs/gfs2/sys.c +1 -1
@@ -96,7 +96,7 @@ static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf)struct super_block *sb = sdp->sd_vfs;int frozen = (sb->s_writers.frozen ==SB_UNFROZEN ) ?0 :1 ; -return snprintf (buf,PAGE_SIZE ,"%u\n" , frozen); +return snprintf (buf,PAGE_SIZE ,"%d\n" , frozen); }static ssize_t freeze_store (struct gfs2_sbd *sdp,const char *buf,size_t len)
Signature · 1 line
1.8.3.1
PATCH 3/5 GFS2: Eliminate a nonsense goto
In reply to Steven WhitehouseFrom: Bob Peterson <[email protected]>
This patch just removes a goto that did nothing.
fs/gfs2/inode.c +0 -3
@@ -543,10 +543,7 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name, } error =gfs2_dir_add (&dip->i_inode, name, ip, da); -if (error) - goto fail_end_trans; -fail_end_trans:gfs2_trans_end (sdp); fail_ipreserv:gfs2_inplace_release (dip);
Signature · 1 line
1.8.3.1
PATCH 4/5 GFS2: use __vmalloc GFP_NOFS for fs-related allocations.
In reply to Steven WhitehouseFrom: Oleg Drokin <[email protected]>
leaf_dealloc uses vzalloc as a fallback to kzalloc(GFP_NOFS), so it clearly does not want any shrinker activity within the fs itself. convert vzalloc into __vmalloc(GFP_NOFS|__GFP_ZERO) to better achieve this goal.
fs/gfs2/dir.c +2 -1
@@ -1896,7 +1896,8 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, ht =kzalloc (size,GFP_NOFS | __GFP_NOWARN);if (ht ==NULL ) - ht =vzalloc (size); + ht =__vmalloc (size,GFP_NOFS | __GFP_NOWARN | __GFP_ZERO, +PAGE_KERNEL );if (!ht)return -ENOMEM ;
Signature · 1 line
1.8.3.1
PATCH 5/5 GFS2: Fix crash during ACL deletion in acl max entry check in gfs2_set_acl()
In reply to Steven WhitehouseFrom: Andrew Elble <[email protected]>
fs/gfs2/acl.c +1 -1
@@ -73,7 +73,7 @@ int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)BUG_ON (name ==NULL ); -if (acl->a_count >GFS2_ACL_MAX_ENTRIES (GFS2_SB (inode))) +if (acl && acl->a_count >GFS2_ACL_MAX_ENTRIES (GFS2_SB (inode)))return -E2BIG ;if (type ==ACL_TYPE_ACCESS ) {
Signature · 1 line
1.8.3.1