[PATCH] [GFS2] Make the log reserved blocks depend on block size

From: Steven Whitehouse <[email protected]>

The number of blocks which we reserve in the log at the start of each
transaction needs to depends upon the block size since the overhead is
related to the number of "pointers" which can be fitted into a single
block.

This relates to Red Hat bz #240435

Signed-off-by: Steven Whitehouse <[email protected]>

diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 291415d..586923d 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -262,7 +262,7 @@ static void ail2_empty(struct gfs2_sbd *sdp, unsigned int new_tail)
  * @sdp: The GFS2 superblock
  * @blks: The number of blocks to reserve
  *
- * Note that we never give out the last 6 blocks of the journal. Thats
+ * Note that we never give out the last few blocks of the journal. Thats
  * due to the fact that there is are a small number of header blocks
  * associated with each log flush. The exact number can't be known until
  * flush time, so we ensure that we have just enough free blocks at all
@@ -274,6 +274,7 @@ static void ail2_empty(struct gfs2_sbd *sdp, unsigned int new_tail)
 int gfs2_log_reserve(struct gfs2_sbd *sdp, unsigned int blks)
 {
 	unsigned int try = 0;
+	unsigned reserved_blks = 6 * (4096 / sdp->sd_vfs->s_blocksize);
 
 	if (gfs2_assert_warn(sdp, blks) ||
 	    gfs2_assert_warn(sdp, blks <= sdp->sd_jdesc->jd_blocks))
@@ -281,7 +282,7 @@ int gfs2_log_reserve(struct gfs2_sbd *sdp, unsigned int blks)
 
 	mutex_lock(&sdp->sd_log_reserve_mutex);
 	gfs2_log_lock(sdp);
-	while(sdp->sd_log_blks_free <= (blks + 6)) {
+	while(sdp->sd_log_blks_free <= (blks + reserved_blks)) {
 		gfs2_log_unlock(sdp);
 		gfs2_ail1_empty(sdp, 0);
 		gfs2_log_flush(sdp, NULL);
-- 
1.5.1.2

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH] [DLM] fix socket shutdown
    • From: [email protected]

• References:
  • [GFS2/DLM] Pre-pull Patch Posting
    • From: [email protected]
  • [PATCH] [GFS2] flush the glock completely in inode_go_sync
    • From: [email protected]
  • [PATCH] [DLM] fix a couple of races
    • From: [email protected]
  • [PATCH] [GFS2] kernel changes to support new gfs2_grow command
    • From: [email protected]
  • [PATCH] [GFS2] Kernel changes to support new gfs2_grow command (part 2)
    • From: [email protected]
  • [PATCH] [GFS2] use zero_user_page
    • From: [email protected]
  • [PATCH] [GFS2] Addendum patch 2 for gfs2_grow
    • From: [email protected]
  • [PATCH] [GFS2] Reduce size of struct gdlm_lock
    • From: [email protected]
  • [PATCH] [GFS2] Clean up inode number handling
    • From: [email protected]
  • [PATCH] [GFS2] Quotas non-functional - fix bug
    • From: [email protected]
  • [PATCH] [DLM] keep dlm from panicing when traversing rsb list in debugfs
    • From: [email protected]
  • [PATCH] [DLM] block scand during recovery [1/6]
    • From: [email protected]
  • [PATCH] [DLM] add lock timeouts and warnings [2/6]
    • From: [email protected]
  • [PATCH] [DLM] dlm_device interface changes [3/6]
    • From: [email protected]
  • [PATCH] [DLM] cancel in conversion deadlock [4/6]
    • From: [email protected]
  • [PATCH] [DLM] fix new_lockspace error exit [5/6]
    • From: [email protected]
  • [PATCH] [DLM] wait for config check during join [6/6]
    • From: [email protected]
  • [PATCH] [DLM] fix compile breakage
    • From: [email protected]
  • [PATCH] [GFS2] latest gfs2-nmw headers break userland build
    • From: [email protected]
  • [PATCH] [DLM] Compile fix
    • From: [email protected]
  • [PATCH] [DLM] timeout fixes
    • From: [email protected]
  • [PATCH] [DLM] canceling deadlocked lock
    • From: [email protected]
  • [PATCH] [DLM] dumping master locks
    • From: [email protected]
  • [PATCH] [DLM] show default protocol
    • From: [email protected]
  • [PATCH] [GFS2] Quotas non-functional - fix another bug
    • From: [email protected]

• Prev by Date: [PATCH] [GFS2] Quotas non-functional - fix another bug
• Next by Date: [PATCH] [DLM] fix socket shutdown
• Previous by thread: [PATCH] [GFS2] Quotas non-functional - fix another bug
• Next by thread: [PATCH] [DLM] fix socket shutdown
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]