From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Peterson Date: Fri, 26 May 2017 09:56:28 -0400 (EDT) Subject: [Cluster-devel] [GFS2 PATCH V2] GFS2: Combine func meta_prep_new with its only caller In-Reply-To: <2004376135.14896837.1495806824589.JavaMail.zimbra@redhat.com> Message-ID: <1752575275.14905093.1495806988111.JavaMail.zimbra@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi, This patch is the same as the one I posted earlier, but I moved the setting of mh_magic inside the protection of the buffer lock, since Steve pointed out how flawed that was. I like Steve's other idea of combining some of the other code of the callers, for example, adding the new buffer to an existing transaction, but I'll address that with a later patch. Regards, Bob Peterson --- Before this patch function meta_prep_new was only called in one place, function gfs2_meta_new which is only a couple lines long. This patch combines them for readability. Signed-off-by: Bob Peterson --- diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c index 663ffc1..b1705a7 100644 --- a/fs/gfs2/meta_io.c +++ b/fs/gfs2/meta_io.c @@ -158,18 +158,6 @@ struct buffer_head *gfs2_getbuf(struct gfs2_glock *gl, u64 blkno, int create) return bh; } -static void meta_prep_new(struct buffer_head *bh) -{ - struct gfs2_meta_header *mh = (struct gfs2_meta_header *)bh->b_data; - - lock_buffer(bh); - clear_buffer_dirty(bh); - set_buffer_uptodate(bh); - unlock_buffer(bh); - - mh->mh_magic = cpu_to_be32(GFS2_MAGIC); -} - /** * gfs2_meta_new - Get a block * @gl: The glock associated with this block @@ -180,9 +168,15 @@ static void meta_prep_new(struct buffer_head *bh) struct buffer_head *gfs2_meta_new(struct gfs2_glock *gl, u64 blkno) { - struct buffer_head *bh; - bh = gfs2_getbuf(gl, blkno, CREATE); - meta_prep_new(bh); + struct buffer_head *bh = gfs2_getbuf(gl, blkno, CREATE); + struct gfs2_meta_header *mh = (struct gfs2_meta_header *)bh->b_data; + + lock_buffer(bh); + clear_buffer_dirty(bh); + set_buffer_uptodate(bh); + mh->mh_magic = cpu_to_be32(GFS2_MAGIC); + unlock_buffer(bh); + return bh; }