From: Steven Whitehouse <swhiteho@redhat.com>
To: linux-kernel@vger.kernel.org, cluster-devel@redhat.com
Cc: Steven Whitehouse <swhiteho@redhat.com>
Subject: [PATCH 01/24] GFS2: Drop "pull" argument from log_write_header()
Date: Thu, 17 May 2012 13:23:08 +0100 [thread overview]
Message-ID: <1337257411-3173-2-git-send-email-swhiteho@redhat.com> (raw)
In-Reply-To: <1337257411-3173-1-git-send-email-swhiteho@redhat.com>
The "pull" argument to log_write_header() is only used
for debug purposes and it is not really needed any more. There
are other tests for this particular problem, so I think we can
dispose of it in order to simplify the code.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 4752ead..d886a17 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -32,8 +32,6 @@
#include "dir.h"
#include "trace_gfs2.h"
-#define PULL 1
-
/**
* gfs2_struct2blk - compute stuff
* @sdp: the filesystem
@@ -580,7 +578,7 @@ static void gfs2_ordered_wait(struct gfs2_sbd *sdp)
* Returns: the initialized log buffer descriptor
*/
-static void log_write_header(struct gfs2_sbd *sdp, u32 flags, int pull)
+static void log_write_header(struct gfs2_sbd *sdp, u32 flags)
{
u64 blkno = gfs2_log_bmap(sdp, sdp->sd_log_flush_head);
struct buffer_head *bh;
@@ -628,8 +626,6 @@ static void log_write_header(struct gfs2_sbd *sdp, u32 flags, int pull)
if (sdp->sd_log_tail != tail)
log_pull_tail(sdp, tail);
- else
- gfs2_assert_withdraw(sdp, !pull);
sdp->sd_log_idle = (tail == sdp->sd_log_flush_head);
gfs2_log_incr_head(sdp);
@@ -680,13 +676,13 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl)
lops_before_commit(sdp);
if (sdp->sd_log_head != sdp->sd_log_flush_head) {
- log_write_header(sdp, 0, 0);
+ log_write_header(sdp, 0);
} else if (sdp->sd_log_tail != current_tail(sdp) && !sdp->sd_log_idle){
gfs2_log_lock(sdp);
atomic_dec(&sdp->sd_log_blks_free); /* Adjust for unreserved buffer */
trace_gfs2_log_blocks(sdp, -1);
gfs2_log_unlock(sdp);
- log_write_header(sdp, 0, PULL);
+ log_write_header(sdp, 0);
}
lops_after_commit(sdp, ai);
@@ -798,8 +794,7 @@ void gfs2_log_shutdown(struct gfs2_sbd *sdp)
sdp->sd_log_flush_head = sdp->sd_log_head;
sdp->sd_log_flush_wrapped = 0;
- log_write_header(sdp, GFS2_LOG_HEAD_UNMOUNT,
- (sdp->sd_log_tail == current_tail(sdp)) ? 0 : PULL);
+ log_write_header(sdp, GFS2_LOG_HEAD_UNMOUNT);
gfs2_assert_warn(sdp, atomic_read(&sdp->sd_log_blks_free) == sdp->sd_jdesc->jd_blocks);
gfs2_assert_warn(sdp, sdp->sd_log_head == sdp->sd_log_tail);
--
1.7.4
next prev parent reply other threads:[~2012-05-17 12:48 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-17 12:23 GFS2: Pre-pull patch posting (merge window) Steven Whitehouse
2012-05-17 12:23 ` Steven Whitehouse [this message]
2012-05-17 12:23 ` [PATCH 02/24] GFS2: Make gfs2_log_fake_buf() write the buffer too Steven Whitehouse
2012-05-17 12:23 ` [PATCH 03/24] GFS2: Rename function gfs2_close to gfs2_release Steven Whitehouse
2012-05-17 12:23 ` [PATCH 04/24] GFS2: make function gfs2_page_add_databufs static Steven Whitehouse
2012-05-17 12:23 ` [PATCH 05/24] GFS2: Use slab for block reservation memory Steven Whitehouse
2012-05-17 12:23 ` [PATCH 06/24] GFS2: Eliminate offset parameter to gfs2_setbit Steven Whitehouse
2012-05-17 12:23 ` [PATCH 07/24] GFS2: Fix function parameter comments in rgrp.c Steven Whitehouse
2012-05-17 12:23 ` [PATCH 08/24] GFS2: Change variable blk to biblk Steven Whitehouse
2012-05-17 12:23 ` [PATCH 09/24] GFS2: Use variable rather than qa to determine if unstuff necessary Steven Whitehouse
2012-05-17 12:23 ` [PATCH 10/24] GFS2: Clean up log write code path Steven Whitehouse
2012-05-17 12:23 ` [PATCH 11/24] GFS2: Remove duplicate log code Steven Whitehouse
2012-05-17 12:23 ` [PATCH 12/24] GFS2: Remove bd_list_tr Steven Whitehouse
2012-05-17 12:23 ` [PATCH 13/24] GFS2: Remove unused argument from gfs2_internal_read Steven Whitehouse
2012-05-17 12:23 ` [PATCH 14/24] GFS2: Log code fixes Steven Whitehouse
2012-05-17 12:23 ` [PATCH 15/24] GFS2: Eliminate needless parameter from function gfs2_setbit Steven Whitehouse
2012-05-17 12:23 ` [PATCH 16/24] GFS2: Eliminate vestigial sd_log_le_rg Steven Whitehouse
2012-05-17 12:23 ` [PATCH 17/24] GFS2: eliminate log elements and simplify Steven Whitehouse
2012-05-17 12:23 ` [PATCH 18/24] GFS2: Fix sgid propagation when using ACLs Steven Whitehouse
2012-05-17 12:23 ` [PATCH 19/24] GFS2: Remove redundant metadata block type check Steven Whitehouse
2012-05-17 12:23 ` [PATCH 20/24] GFS2: Update main gfs2 doc Steven Whitehouse
2012-05-17 12:23 ` [PATCH 21/24] GFS2: Update glock doc to add new stats info Steven Whitehouse
2012-05-17 12:23 ` [PATCH 22/24] GFS2: Eliminate unused "new" parameter to gfs2_meta_indirect_buffer Steven Whitehouse
2012-05-17 12:23 ` [PATCH 23/24] GFS2: Add rgrp information to block_alloc trace point Steven Whitehouse
2012-05-17 12:23 ` [PATCH 24/24] GFS2: Fix quota adjustment return code Steven Whitehouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337257411-3173-2-git-send-email-swhiteho@redhat.com \
--to=swhiteho@redhat.com \
--cc=cluster-devel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®