2006-01-16 16:50:04 +00:00
|
|
|
/*
|
|
|
|
|
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
|
2007-12-12 00:49:21 +00:00
|
|
|
* Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
|
2006-01-16 16:50:04 +00:00
|
|
|
*
|
|
|
|
|
* This copyrighted material is made available to anyone wishing to use,
|
|
|
|
|
* modify, copy, or redistribute it subject to the terms and conditions
|
2006-09-01 15:05:15 +00:00
|
|
|
* of the GNU General Public License version 2.
|
2006-01-16 16:50:04 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <linux/sched.h>
|
|
|
|
|
#include <linux/slab.h>
|
|
|
|
|
#include <linux/spinlock.h>
|
|
|
|
|
#include <linux/completion.h>
|
|
|
|
|
#include <linux/buffer_head.h>
|
2006-02-27 22:23:27 +00:00
|
|
|
#include <linux/gfs2_ondisk.h>
|
2006-03-28 19:14:04 +00:00
|
|
|
#include <linux/crc32.h>
|
2006-11-23 16:06:35 +00:00
|
|
|
#include <linux/delay.h>
|
2007-11-09 10:01:41 +00:00
|
|
|
#include <linux/kthread.h>
|
|
|
|
|
#include <linux/freezer.h>
|
2008-09-26 09:23:22 +00:00
|
|
|
#include <linux/bio.h>
|
2011-04-18 13:18:09 +00:00
|
|
|
#include <linux/writeback.h>
|
2012-02-14 19:49:57 +00:00
|
|
|
#include <linux/list_sort.h>
|
2006-01-16 16:50:04 +00:00
|
|
|
|
|
|
|
|
#include "gfs2.h"
|
2006-02-27 22:23:27 +00:00
|
|
|
#include "incore.h"
|
2006-01-16 16:50:04 +00:00
|
|
|
#include "bmap.h"
|
|
|
|
|
#include "glock.h"
|
|
|
|
|
#include "log.h"
|
|
|
|
|
#include "lops.h"
|
|
|
|
|
#include "meta_io.h"
|
2006-02-27 22:23:27 +00:00
|
|
|
#include "util.h"
|
2006-03-28 19:14:04 +00:00
|
|
|
#include "dir.h"
|
2009-06-12 07:49:20 +00:00
|
|
|
#include "trace_gfs2.h"
|
2006-01-16 16:50:04 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* gfs2_struct2blk - compute stuff
|
|
|
|
|
* @sdp: the filesystem
|
|
|
|
|
* @nstruct: the number of structures
|
|
|
|
|
* @ssize: the size of the structures
|
|
|
|
|
*
|
|
|
|
|
* Compute the number of log descriptor blocks needed to hold a certain number
|
|
|
|
|
* of structures of a certain size.
|
|
|
|
|
*
|
|
|
|
|
* Returns: the number of blocks needed (minimum is always 1)
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
unsigned int gfs2_struct2blk(struct gfs2_sbd *sdp, unsigned int nstruct,
|
|
|
|
|
unsigned int ssize)
|
|
|
|
|
{
|
|
|
|
|
unsigned int blks;
|
|
|
|
|
unsigned int first, second;
|
|
|
|
|
|
|
|
|
|
blks = 1;
|
2006-09-13 15:13:27 +00:00
|
|
|
first = (sdp->sd_sb.sb_bsize - sizeof(struct gfs2_log_descriptor)) / ssize;
|
2006-01-16 16:50:04 +00:00
|
|
|
|
|
|
|
|
if (nstruct > first) {
|
2006-02-27 17:00:42 +00:00
|
|
|
second = (sdp->sd_sb.sb_bsize -
|
|
|
|
|
sizeof(struct gfs2_meta_header)) / ssize;
|
2006-02-27 22:23:27 +00:00
|
|
|
blks += DIV_ROUND_UP(nstruct - first, second);
|
2006-01-16 16:50:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return blks;
|
|
|
|
|
}
|
|
|
|
|
|
2007-08-27 08:45:26 +00:00
|
|
|
/**
|
|
|
|
|
* gfs2_remove_from_ail - Remove an entry from the ail lists, updating counters
|
|
|
|
|
* @mapping: The associated mapping (maybe NULL)
|
|
|
|
|
* @bd: The gfs2_bufdata to remove
|
|
|
|
|
*
|
2011-03-14 12:40:29 +00:00
|
|
|
* The ail lock _must_ be held when calling this function
|
2007-08-27 08:45:26 +00:00
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
2007-10-15 15:29:05 +00:00
|
|
|
void gfs2_remove_from_ail(struct gfs2_bufdata *bd)
|
2007-08-27 08:45:26 +00:00
|
|
|
{
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
bd->bd_tr = NULL;
|
2007-09-03 10:01:33 +00:00
|
|
|
list_del_init(&bd->bd_ail_st_list);
|
|
|
|
|
list_del_init(&bd->bd_ail_gl_list);
|
2007-08-27 08:45:26 +00:00
|
|
|
atomic_dec(&bd->bd_gl->gl_ail_count);
|
|
|
|
|
brelse(bd->bd_bh);
|
|
|
|
|
}
|
|
|
|
|
|
2006-10-03 15:10:41 +00:00
|
|
|
/**
|
|
|
|
|
* gfs2_ail1_start_one - Start I/O on a part of the AIL
|
|
|
|
|
* @sdp: the filesystem
|
2011-04-18 13:18:09 +00:00
|
|
|
* @wbc: The writeback control structure
|
|
|
|
|
* @ai: The ail structure
|
2006-10-03 15:10:41 +00:00
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
2011-04-26 09:23:56 +00:00
|
|
|
static int gfs2_ail1_start_one(struct gfs2_sbd *sdp,
|
|
|
|
|
struct writeback_control *wbc,
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
struct gfs2_trans *tr)
|
2011-03-11 11:52:25 +00:00
|
|
|
__releases(&sdp->sd_ail_lock)
|
|
|
|
|
__acquires(&sdp->sd_ail_lock)
|
2006-10-03 15:10:41 +00:00
|
|
|
{
|
2011-03-30 15:25:51 +00:00
|
|
|
struct gfs2_glock *gl = NULL;
|
2011-04-18 13:18:09 +00:00
|
|
|
struct address_space *mapping;
|
2006-10-03 15:10:41 +00:00
|
|
|
struct gfs2_bufdata *bd, *s;
|
|
|
|
|
struct buffer_head *bh;
|
|
|
|
|
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
list_for_each_entry_safe_reverse(bd, s, &tr->tr_ail1_list, bd_ail_st_list) {
|
2011-04-18 13:18:09 +00:00
|
|
|
bh = bd->bd_bh;
|
2006-10-03 15:10:41 +00:00
|
|
|
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
gfs2_assert(sdp, bd->bd_tr == tr);
|
2006-10-03 15:10:41 +00:00
|
|
|
|
2011-04-18 13:18:09 +00:00
|
|
|
if (!buffer_busy(bh)) {
|
|
|
|
|
if (!buffer_uptodate(bh))
|
|
|
|
|
gfs2_io_error_bh(sdp, bh);
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
list_move(&bd->bd_ail_st_list, &tr->tr_ail2_list);
|
2011-04-18 13:18:09 +00:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!buffer_dirty(bh))
|
|
|
|
|
continue;
|
|
|
|
|
if (gl == bd->bd_gl)
|
|
|
|
|
continue;
|
|
|
|
|
gl = bd->bd_gl;
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
list_move(&bd->bd_ail_st_list, &tr->tr_ail1_list);
|
2011-04-18 13:18:09 +00:00
|
|
|
mapping = bh->b_page->mapping;
|
2011-04-26 09:23:56 +00:00
|
|
|
if (!mapping)
|
|
|
|
|
continue;
|
2011-04-18 13:18:09 +00:00
|
|
|
spin_unlock(&sdp->sd_ail_lock);
|
|
|
|
|
generic_writepages(mapping, wbc);
|
|
|
|
|
spin_lock(&sdp->sd_ail_lock);
|
|
|
|
|
if (wbc->nr_to_write <= 0)
|
|
|
|
|
break;
|
2011-04-26 09:23:56 +00:00
|
|
|
return 1;
|
2011-04-18 13:18:09 +00:00
|
|
|
}
|
2011-04-26 09:23:56 +00:00
|
|
|
|
|
|
|
|
return 0;
|
2011-04-18 13:18:09 +00:00
|
|
|
}
|
2006-10-03 15:10:41 +00:00
|
|
|
|
|
|
|
|
|
2011-04-18 13:18:09 +00:00
|
|
|
/**
|
|
|
|
|
* gfs2_ail1_flush - start writeback of some ail1 entries
|
|
|
|
|
* @sdp: The super block
|
|
|
|
|
* @wbc: The writeback control structure
|
|
|
|
|
*
|
|
|
|
|
* Writes back some ail1 entries, according to the limits in the
|
|
|
|
|
* writeback control structure
|
|
|
|
|
*/
|
2006-10-03 15:10:41 +00:00
|
|
|
|
2011-04-18 13:18:09 +00:00
|
|
|
void gfs2_ail1_flush(struct gfs2_sbd *sdp, struct writeback_control *wbc)
|
|
|
|
|
{
|
|
|
|
|
struct list_head *head = &sdp->sd_ail1_list;
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
struct gfs2_trans *tr;
|
2006-10-03 15:10:41 +00:00
|
|
|
|
2011-04-18 13:18:38 +00:00
|
|
|
trace_gfs2_ail_flush(sdp, wbc, 1);
|
2011-04-18 13:18:09 +00:00
|
|
|
spin_lock(&sdp->sd_ail_lock);
|
2011-04-26 09:23:56 +00:00
|
|
|
restart:
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
list_for_each_entry_reverse(tr, head, tr_list) {
|
2011-04-18 13:18:09 +00:00
|
|
|
if (wbc->nr_to_write <= 0)
|
2006-10-03 15:10:41 +00:00
|
|
|
break;
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
if (gfs2_ail1_start_one(sdp, wbc, tr))
|
2011-04-26 09:23:56 +00:00
|
|
|
goto restart;
|
2011-04-18 13:18:09 +00:00
|
|
|
}
|
|
|
|
|
spin_unlock(&sdp->sd_ail_lock);
|
2011-04-18 13:18:38 +00:00
|
|
|
trace_gfs2_ail_flush(sdp, wbc, 0);
|
2011-04-18 13:18:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* gfs2_ail1_start - start writeback of all ail1 entries
|
|
|
|
|
* @sdp: The superblock
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static void gfs2_ail1_start(struct gfs2_sbd *sdp)
|
|
|
|
|
{
|
|
|
|
|
struct writeback_control wbc = {
|
|
|
|
|
.sync_mode = WB_SYNC_NONE,
|
|
|
|
|
.nr_to_write = LONG_MAX,
|
|
|
|
|
.range_start = 0,
|
|
|
|
|
.range_end = LLONG_MAX,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
return gfs2_ail1_flush(sdp, &wbc);
|
2006-10-03 15:10:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* gfs2_ail1_empty_one - Check whether or not a trans in the AIL has been synced
|
|
|
|
|
* @sdp: the filesystem
|
|
|
|
|
* @ai: the AIL entry
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
static void gfs2_ail1_empty_one(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
|
2006-10-03 15:10:41 +00:00
|
|
|
{
|
|
|
|
|
struct gfs2_bufdata *bd, *s;
|
|
|
|
|
struct buffer_head *bh;
|
|
|
|
|
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
list_for_each_entry_safe_reverse(bd, s, &tr->tr_ail1_list,
|
2006-10-03 15:10:41 +00:00
|
|
|
bd_ail_st_list) {
|
|
|
|
|
bh = bd->bd_bh;
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
gfs2_assert(sdp, bd->bd_tr == tr);
|
2011-04-18 13:18:09 +00:00
|
|
|
if (buffer_busy(bh))
|
|
|
|
|
continue;
|
2006-10-03 15:10:41 +00:00
|
|
|
if (!buffer_uptodate(bh))
|
|
|
|
|
gfs2_io_error_bh(sdp, bh);
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
list_move(&bd->bd_ail_st_list, &tr->tr_ail2_list);
|
2006-10-03 15:10:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2011-04-18 13:18:09 +00:00
|
|
|
/**
|
|
|
|
|
* gfs2_ail1_empty - Try to empty the ail1 lists
|
|
|
|
|
* @sdp: The superblock
|
|
|
|
|
*
|
|
|
|
|
* Tries to empty the ail1 lists, starting with the oldest first
|
|
|
|
|
*/
|
2006-01-16 16:50:04 +00:00
|
|
|
|
2011-04-18 13:18:09 +00:00
|
|
|
static int gfs2_ail1_empty(struct gfs2_sbd *sdp)
|
2006-01-16 16:50:04 +00:00
|
|
|
{
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
struct gfs2_trans *tr, *s;
|
2013-06-14 16:38:29 +00:00
|
|
|
int oldest_tr = 1;
|
2006-01-16 16:50:04 +00:00
|
|
|
int ret;
|
|
|
|
|
|
2011-03-11 11:52:25 +00:00
|
|
|
spin_lock(&sdp->sd_ail_lock);
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
list_for_each_entry_safe_reverse(tr, s, &sdp->sd_ail1_list, tr_list) {
|
|
|
|
|
gfs2_ail1_empty_one(sdp, tr);
|
2013-06-14 16:38:29 +00:00
|
|
|
if (list_empty(&tr->tr_ail1_list) && oldest_tr)
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
list_move(&tr->tr_list, &sdp->sd_ail2_list);
|
2011-04-18 13:18:09 +00:00
|
|
|
else
|
2013-06-14 16:38:29 +00:00
|
|
|
oldest_tr = 0;
|
2006-01-16 16:50:04 +00:00
|
|
|
}
|
|
|
|
|
ret = list_empty(&sdp->sd_ail1_list);
|
2011-03-11 11:52:25 +00:00
|
|
|
spin_unlock(&sdp->sd_ail_lock);
|
2006-01-16 16:50:04 +00:00
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-21 18:21:07 +00:00
|
|
|
static void gfs2_ail1_wait(struct gfs2_sbd *sdp)
|
|
|
|
|
{
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
struct gfs2_trans *tr;
|
2011-05-21 18:21:07 +00:00
|
|
|
struct gfs2_bufdata *bd;
|
|
|
|
|
struct buffer_head *bh;
|
|
|
|
|
|
|
|
|
|
spin_lock(&sdp->sd_ail_lock);
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
list_for_each_entry_reverse(tr, &sdp->sd_ail1_list, tr_list) {
|
|
|
|
|
list_for_each_entry(bd, &tr->tr_ail1_list, bd_ail_st_list) {
|
2011-05-21 18:21:07 +00:00
|
|
|
bh = bd->bd_bh;
|
|
|
|
|
if (!buffer_locked(bh))
|
|
|
|
|
continue;
|
|
|
|
|
get_bh(bh);
|
|
|
|
|
spin_unlock(&sdp->sd_ail_lock);
|
|
|
|
|
wait_on_buffer(bh);
|
|
|
|
|
brelse(bh);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
spin_unlock(&sdp->sd_ail_lock);
|
|
|
|
|
}
|
2006-10-03 15:10:41 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* gfs2_ail2_empty_one - Check whether or not a trans in the AIL has been synced
|
|
|
|
|
* @sdp: the filesystem
|
|
|
|
|
* @ai: the AIL entry
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
static void gfs2_ail2_empty_one(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
|
2006-10-03 15:10:41 +00:00
|
|
|
{
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
struct list_head *head = &tr->tr_ail2_list;
|
2006-10-03 15:10:41 +00:00
|
|
|
struct gfs2_bufdata *bd;
|
|
|
|
|
|
|
|
|
|
while (!list_empty(head)) {
|
|
|
|
|
bd = list_entry(head->prev, struct gfs2_bufdata,
|
|
|
|
|
bd_ail_st_list);
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
gfs2_assert(sdp, bd->bd_tr == tr);
|
2007-10-15 15:29:05 +00:00
|
|
|
gfs2_remove_from_ail(bd);
|
2006-10-03 15:10:41 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-16 16:50:04 +00:00
|
|
|
static void ail2_empty(struct gfs2_sbd *sdp, unsigned int new_tail)
|
|
|
|
|
{
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
struct gfs2_trans *tr, *safe;
|
2006-01-16 16:50:04 +00:00
|
|
|
unsigned int old_tail = sdp->sd_log_tail;
|
|
|
|
|
int wrap = (new_tail < old_tail);
|
|
|
|
|
int a, b, rm;
|
|
|
|
|
|
2011-03-11 11:52:25 +00:00
|
|
|
spin_lock(&sdp->sd_ail_lock);
|
2006-01-16 16:50:04 +00:00
|
|
|
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
list_for_each_entry_safe(tr, safe, &sdp->sd_ail2_list, tr_list) {
|
|
|
|
|
a = (old_tail <= tr->tr_first);
|
|
|
|
|
b = (tr->tr_first < new_tail);
|
2006-01-16 16:50:04 +00:00
|
|
|
rm = (wrap) ? (a || b) : (a && b);
|
|
|
|
|
if (!rm)
|
|
|
|
|
continue;
|
|
|
|
|
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
gfs2_ail2_empty_one(sdp, tr);
|
|
|
|
|
list_del(&tr->tr_list);
|
|
|
|
|
gfs2_assert_warn(sdp, list_empty(&tr->tr_ail1_list));
|
|
|
|
|
gfs2_assert_warn(sdp, list_empty(&tr->tr_ail2_list));
|
|
|
|
|
kfree(tr);
|
2006-01-16 16:50:04 +00:00
|
|
|
}
|
|
|
|
|
|
2011-03-11 11:52:25 +00:00
|
|
|
spin_unlock(&sdp->sd_ail_lock);
|
2006-01-16 16:50:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* gfs2_log_reserve - Make a log reservation
|
|
|
|
|
* @sdp: The GFS2 superblock
|
|
|
|
|
* @blks: The number of blocks to reserve
|
|
|
|
|
*
|
2007-06-01 14:19:33 +00:00
|
|
|
* Note that we never give out the last few blocks of the journal. Thats
|
[GFS2] assertion failure after writing to journaled file, umount
This patch passes all my nasty tests that were causing the code to
fail under one circumstance or another. Here is a complete summary
of all changes from today's git tree, in order of appearance:
1. There are now separate variables for metadata buffer accounting.
2. Variable sd_log_num_hdrs is no longer needed, since the header
accounting is taken care of by the reserve/refund sequence.
3. Fixed a tiny grammatical problem in a comment.
4. Added a new function "calc_reserved" to calculate the reserved
log space. This isn't entirely necessary, but it has two benefits:
First, it simplifies the gfs2_log_refund function greatly.
Second, it allows for easier debugging because I could sprinkle the
code with calls to this function to make sure the accounting is
proper (by adding asserts and printks) at strategic point of the code.
5. In log_pull_tail there apparently was a kludge to fix up the
accounting based on a "pull" parameter. The buffer accounting is
now done properly, so the kludge was removed.
6. File sync operations were making a call to gfs2_log_flush that
writes another journal header. Since that header was unplanned
for (reserved) by the reserve/refund sequence, the free space had
to be decremented so that when log_pull_tail gets called, the free
space is be adjusted properly. (Did I hear you call that a kludge?
well, maybe, but a lot more justifiable than the one I removed).
7. In the gfs2_log_shutdown code, it optionally syncs the log by
specifying the PULL parameter to log_write_header. I'm not sure
this is necessary anymore. It just seems to me there could be
cases where shutdown is called while there are outstanding log
buffers.
8. In the (data)buf_lo_before_commit functions, I changed some offset
values from being calculated on the fly to being constants. That
simplified some code and we might as well let the compiler do the
calculation once rather than redoing those cycles at run time.
9. This version has my rewritten databuf_lo_add function.
This version is much more like its predecessor, buf_lo_add, which
makes it easier to understand. Again, this might not be necessary,
but it seems as if this one works as well as the previous one,
maybe even better, so I decided to leave it in.
10. In databuf_lo_before_commit, a previous data corruption problem
was caused by going off the end of the buffer. The proper solution
is to have the proper limit in place, rather than stopping earlier.
(Thus my previous attempt to fix it is wrong).
If you don't wrap the buffer, you're stopping too early and that
causes more log buffer accounting problems.
11. In lops.h there are two new (previously mentioned) constants for
figuring out the data offset for the journal buffers.
12. There are also two new functions, buf_limit and databuf_limit to
calculate how many entries will fit in the buffer.
13. In function gfs2_meta_wipe, it needs to distinguish between pinned
metadata buffers and journaled data buffers for proper journal buffer
accounting. It can't use the JDATA gfs2_inode flag because it's
sometimes passed the "real" inode and sometimes the "metadata
inode" and the inode flags will be random bits in a metadata
gfs2_inode. It needs to base its decision on which was passed in.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2007-06-18 19:50:20 +00:00
|
|
|
* due to the fact that there is a small number of header blocks
|
2006-11-23 15:51:34 +00:00
|
|
|
* 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
|
|
|
|
|
* times to avoid running out during a log flush.
|
|
|
|
|
*
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
* We no longer flush the log here, instead we wake up logd to do that
|
|
|
|
|
* for us. To avoid the thundering herd and to ensure that we deal fairly
|
|
|
|
|
* with queued waiters, we use an exclusive wait. This means that when we
|
|
|
|
|
* get woken with enough journal space to get our reservation, we need to
|
|
|
|
|
* wake the next waiter on the list.
|
|
|
|
|
*
|
2006-01-16 16:50:04 +00:00
|
|
|
* Returns: errno
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int gfs2_log_reserve(struct gfs2_sbd *sdp, unsigned int blks)
|
|
|
|
|
{
|
2013-06-14 16:38:29 +00:00
|
|
|
unsigned reserved_blks = 7 * (4096 / sdp->sd_vfs->s_blocksize);
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
unsigned wanted = blks + reserved_blks;
|
|
|
|
|
DEFINE_WAIT(wait);
|
|
|
|
|
int did_wait = 0;
|
|
|
|
|
unsigned int free_blocks;
|
2006-01-16 16:50:04 +00:00
|
|
|
|
|
|
|
|
if (gfs2_assert_warn(sdp, blks) ||
|
|
|
|
|
gfs2_assert_warn(sdp, blks <= sdp->sd_jdesc->jd_blocks))
|
|
|
|
|
return -EINVAL;
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
retry:
|
|
|
|
|
free_blocks = atomic_read(&sdp->sd_log_blks_free);
|
|
|
|
|
if (unlikely(free_blocks <= wanted)) {
|
|
|
|
|
do {
|
|
|
|
|
prepare_to_wait_exclusive(&sdp->sd_log_waitq, &wait,
|
|
|
|
|
TASK_UNINTERRUPTIBLE);
|
|
|
|
|
wake_up(&sdp->sd_logd_waitq);
|
|
|
|
|
did_wait = 1;
|
|
|
|
|
if (atomic_read(&sdp->sd_log_blks_free) <= wanted)
|
|
|
|
|
io_schedule();
|
|
|
|
|
free_blocks = atomic_read(&sdp->sd_log_blks_free);
|
|
|
|
|
} while(free_blocks <= wanted);
|
|
|
|
|
finish_wait(&sdp->sd_log_waitq, &wait);
|
2006-01-16 16:50:04 +00:00
|
|
|
}
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
if (atomic_cmpxchg(&sdp->sd_log_blks_free, free_blocks,
|
|
|
|
|
free_blocks - blks) != free_blocks)
|
|
|
|
|
goto retry;
|
2009-06-12 07:49:20 +00:00
|
|
|
trace_gfs2_log_blocks(sdp, -blks);
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* If we waited, then so might others, wake them up _after_ we get
|
|
|
|
|
* our share of the log.
|
|
|
|
|
*/
|
|
|
|
|
if (unlikely(did_wait))
|
|
|
|
|
wake_up(&sdp->sd_log_waitq);
|
2006-03-29 14:12:12 +00:00
|
|
|
|
|
|
|
|
down_read(&sdp->sd_log_flush_lock);
|
2006-01-16 16:50:04 +00:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* log_distance - Compute distance between two journal blocks
|
|
|
|
|
* @sdp: The GFS2 superblock
|
|
|
|
|
* @newer: The most recent journal block of the pair
|
|
|
|
|
* @older: The older journal block of the pair
|
|
|
|
|
*
|
|
|
|
|
* Compute the distance (in the journal direction) between two
|
|
|
|
|
* blocks in the journal
|
|
|
|
|
*
|
|
|
|
|
* Returns: the distance in blocks
|
|
|
|
|
*/
|
|
|
|
|
|
2006-09-13 15:13:27 +00:00
|
|
|
static inline unsigned int log_distance(struct gfs2_sbd *sdp, unsigned int newer,
|
2006-01-16 16:50:04 +00:00
|
|
|
unsigned int older)
|
|
|
|
|
{
|
|
|
|
|
int dist;
|
|
|
|
|
|
|
|
|
|
dist = newer - older;
|
|
|
|
|
if (dist < 0)
|
|
|
|
|
dist += sdp->sd_jdesc->jd_blocks;
|
|
|
|
|
|
|
|
|
|
return dist;
|
|
|
|
|
}
|
|
|
|
|
|
[GFS2] assertion failure after writing to journaled file, umount
This patch passes all my nasty tests that were causing the code to
fail under one circumstance or another. Here is a complete summary
of all changes from today's git tree, in order of appearance:
1. There are now separate variables for metadata buffer accounting.
2. Variable sd_log_num_hdrs is no longer needed, since the header
accounting is taken care of by the reserve/refund sequence.
3. Fixed a tiny grammatical problem in a comment.
4. Added a new function "calc_reserved" to calculate the reserved
log space. This isn't entirely necessary, but it has two benefits:
First, it simplifies the gfs2_log_refund function greatly.
Second, it allows for easier debugging because I could sprinkle the
code with calls to this function to make sure the accounting is
proper (by adding asserts and printks) at strategic point of the code.
5. In log_pull_tail there apparently was a kludge to fix up the
accounting based on a "pull" parameter. The buffer accounting is
now done properly, so the kludge was removed.
6. File sync operations were making a call to gfs2_log_flush that
writes another journal header. Since that header was unplanned
for (reserved) by the reserve/refund sequence, the free space had
to be decremented so that when log_pull_tail gets called, the free
space is be adjusted properly. (Did I hear you call that a kludge?
well, maybe, but a lot more justifiable than the one I removed).
7. In the gfs2_log_shutdown code, it optionally syncs the log by
specifying the PULL parameter to log_write_header. I'm not sure
this is necessary anymore. It just seems to me there could be
cases where shutdown is called while there are outstanding log
buffers.
8. In the (data)buf_lo_before_commit functions, I changed some offset
values from being calculated on the fly to being constants. That
simplified some code and we might as well let the compiler do the
calculation once rather than redoing those cycles at run time.
9. This version has my rewritten databuf_lo_add function.
This version is much more like its predecessor, buf_lo_add, which
makes it easier to understand. Again, this might not be necessary,
but it seems as if this one works as well as the previous one,
maybe even better, so I decided to leave it in.
10. In databuf_lo_before_commit, a previous data corruption problem
was caused by going off the end of the buffer. The proper solution
is to have the proper limit in place, rather than stopping earlier.
(Thus my previous attempt to fix it is wrong).
If you don't wrap the buffer, you're stopping too early and that
causes more log buffer accounting problems.
11. In lops.h there are two new (previously mentioned) constants for
figuring out the data offset for the journal buffers.
12. There are also two new functions, buf_limit and databuf_limit to
calculate how many entries will fit in the buffer.
13. In function gfs2_meta_wipe, it needs to distinguish between pinned
metadata buffers and journaled data buffers for proper journal buffer
accounting. It can't use the JDATA gfs2_inode flag because it's
sometimes passed the "real" inode and sometimes the "metadata
inode" and the inode flags will be random bits in a metadata
gfs2_inode. It needs to base its decision on which was passed in.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2007-06-18 19:50:20 +00:00
|
|
|
/**
|
|
|
|
|
* calc_reserved - Calculate the number of blocks to reserve when
|
|
|
|
|
* refunding a transaction's unused buffers.
|
|
|
|
|
* @sdp: The GFS2 superblock
|
|
|
|
|
*
|
|
|
|
|
* This is complex. We need to reserve room for all our currently used
|
|
|
|
|
* metadata buffers (e.g. normal file I/O rewriting file time stamps) and
|
|
|
|
|
* all our journaled data buffers for journaled files (e.g. files in the
|
|
|
|
|
* meta_fs like rindex, or files for which chattr +j was done.)
|
|
|
|
|
* If we don't reserve enough space, gfs2_log_refund and gfs2_log_flush
|
|
|
|
|
* will count it as free space (sd_log_blks_free) and corruption will follow.
|
|
|
|
|
*
|
|
|
|
|
* We can have metadata bufs and jdata bufs in the same journal. So each
|
|
|
|
|
* type gets its own log header, for which we need to reserve a block.
|
|
|
|
|
* In fact, each type has the potential for needing more than one header
|
|
|
|
|
* in cases where we have more buffers than will fit on a journal page.
|
|
|
|
|
* Metadata journal entries take up half the space of journaled buffer entries.
|
|
|
|
|
* Thus, metadata entries have buf_limit (502) and journaled buffers have
|
|
|
|
|
* databuf_limit (251) before they cause a wrap around.
|
|
|
|
|
*
|
|
|
|
|
* Also, we need to reserve blocks for revoke journal entries and one for an
|
|
|
|
|
* overall header for the lot.
|
|
|
|
|
*
|
|
|
|
|
* Returns: the number of blocks reserved
|
|
|
|
|
*/
|
|
|
|
|
static unsigned int calc_reserved(struct gfs2_sbd *sdp)
|
|
|
|
|
{
|
|
|
|
|
unsigned int reserved = 0;
|
|
|
|
|
unsigned int mbuf_limit, metabufhdrs_needed;
|
|
|
|
|
unsigned int dbuf_limit, databufhdrs_needed;
|
|
|
|
|
unsigned int revokes = 0;
|
|
|
|
|
|
|
|
|
|
mbuf_limit = buf_limit(sdp);
|
|
|
|
|
metabufhdrs_needed = (sdp->sd_log_commited_buf +
|
|
|
|
|
(mbuf_limit - 1)) / mbuf_limit;
|
|
|
|
|
dbuf_limit = databuf_limit(sdp);
|
|
|
|
|
databufhdrs_needed = (sdp->sd_log_commited_databuf +
|
|
|
|
|
(dbuf_limit - 1)) / dbuf_limit;
|
|
|
|
|
|
2010-03-11 00:10:19 +00:00
|
|
|
if (sdp->sd_log_commited_revoke > 0)
|
[GFS2] assertion failure after writing to journaled file, umount
This patch passes all my nasty tests that were causing the code to
fail under one circumstance or another. Here is a complete summary
of all changes from today's git tree, in order of appearance:
1. There are now separate variables for metadata buffer accounting.
2. Variable sd_log_num_hdrs is no longer needed, since the header
accounting is taken care of by the reserve/refund sequence.
3. Fixed a tiny grammatical problem in a comment.
4. Added a new function "calc_reserved" to calculate the reserved
log space. This isn't entirely necessary, but it has two benefits:
First, it simplifies the gfs2_log_refund function greatly.
Second, it allows for easier debugging because I could sprinkle the
code with calls to this function to make sure the accounting is
proper (by adding asserts and printks) at strategic point of the code.
5. In log_pull_tail there apparently was a kludge to fix up the
accounting based on a "pull" parameter. The buffer accounting is
now done properly, so the kludge was removed.
6. File sync operations were making a call to gfs2_log_flush that
writes another journal header. Since that header was unplanned
for (reserved) by the reserve/refund sequence, the free space had
to be decremented so that when log_pull_tail gets called, the free
space is be adjusted properly. (Did I hear you call that a kludge?
well, maybe, but a lot more justifiable than the one I removed).
7. In the gfs2_log_shutdown code, it optionally syncs the log by
specifying the PULL parameter to log_write_header. I'm not sure
this is necessary anymore. It just seems to me there could be
cases where shutdown is called while there are outstanding log
buffers.
8. In the (data)buf_lo_before_commit functions, I changed some offset
values from being calculated on the fly to being constants. That
simplified some code and we might as well let the compiler do the
calculation once rather than redoing those cycles at run time.
9. This version has my rewritten databuf_lo_add function.
This version is much more like its predecessor, buf_lo_add, which
makes it easier to understand. Again, this might not be necessary,
but it seems as if this one works as well as the previous one,
maybe even better, so I decided to leave it in.
10. In databuf_lo_before_commit, a previous data corruption problem
was caused by going off the end of the buffer. The proper solution
is to have the proper limit in place, rather than stopping earlier.
(Thus my previous attempt to fix it is wrong).
If you don't wrap the buffer, you're stopping too early and that
causes more log buffer accounting problems.
11. In lops.h there are two new (previously mentioned) constants for
figuring out the data offset for the journal buffers.
12. There are also two new functions, buf_limit and databuf_limit to
calculate how many entries will fit in the buffer.
13. In function gfs2_meta_wipe, it needs to distinguish between pinned
metadata buffers and journaled data buffers for proper journal buffer
accounting. It can't use the JDATA gfs2_inode flag because it's
sometimes passed the "real" inode and sometimes the "metadata
inode" and the inode flags will be random bits in a metadata
gfs2_inode. It needs to base its decision on which was passed in.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2007-06-18 19:50:20 +00:00
|
|
|
revokes = gfs2_struct2blk(sdp, sdp->sd_log_commited_revoke,
|
|
|
|
|
sizeof(u64));
|
|
|
|
|
|
|
|
|
|
reserved = sdp->sd_log_commited_buf + metabufhdrs_needed +
|
|
|
|
|
sdp->sd_log_commited_databuf + databufhdrs_needed +
|
|
|
|
|
revokes;
|
|
|
|
|
/* One for the overall header */
|
|
|
|
|
if (reserved)
|
|
|
|
|
reserved++;
|
|
|
|
|
return reserved;
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-16 16:50:04 +00:00
|
|
|
static unsigned int current_tail(struct gfs2_sbd *sdp)
|
|
|
|
|
{
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
struct gfs2_trans *tr;
|
2006-01-16 16:50:04 +00:00
|
|
|
unsigned int tail;
|
|
|
|
|
|
2011-03-11 11:52:25 +00:00
|
|
|
spin_lock(&sdp->sd_ail_lock);
|
2006-01-16 16:50:04 +00:00
|
|
|
|
2006-09-13 15:13:27 +00:00
|
|
|
if (list_empty(&sdp->sd_ail1_list)) {
|
2006-01-16 16:50:04 +00:00
|
|
|
tail = sdp->sd_log_head;
|
2006-09-13 15:13:27 +00:00
|
|
|
} else {
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
tr = list_entry(sdp->sd_ail1_list.prev, struct gfs2_trans,
|
|
|
|
|
tr_list);
|
|
|
|
|
tail = tr->tr_first;
|
2006-01-16 16:50:04 +00:00
|
|
|
}
|
|
|
|
|
|
2011-03-11 11:52:25 +00:00
|
|
|
spin_unlock(&sdp->sd_ail_lock);
|
2006-01-16 16:50:04 +00:00
|
|
|
|
|
|
|
|
return tail;
|
|
|
|
|
}
|
|
|
|
|
|
[GFS2] assertion failure after writing to journaled file, umount
This patch passes all my nasty tests that were causing the code to
fail under one circumstance or another. Here is a complete summary
of all changes from today's git tree, in order of appearance:
1. There are now separate variables for metadata buffer accounting.
2. Variable sd_log_num_hdrs is no longer needed, since the header
accounting is taken care of by the reserve/refund sequence.
3. Fixed a tiny grammatical problem in a comment.
4. Added a new function "calc_reserved" to calculate the reserved
log space. This isn't entirely necessary, but it has two benefits:
First, it simplifies the gfs2_log_refund function greatly.
Second, it allows for easier debugging because I could sprinkle the
code with calls to this function to make sure the accounting is
proper (by adding asserts and printks) at strategic point of the code.
5. In log_pull_tail there apparently was a kludge to fix up the
accounting based on a "pull" parameter. The buffer accounting is
now done properly, so the kludge was removed.
6. File sync operations were making a call to gfs2_log_flush that
writes another journal header. Since that header was unplanned
for (reserved) by the reserve/refund sequence, the free space had
to be decremented so that when log_pull_tail gets called, the free
space is be adjusted properly. (Did I hear you call that a kludge?
well, maybe, but a lot more justifiable than the one I removed).
7. In the gfs2_log_shutdown code, it optionally syncs the log by
specifying the PULL parameter to log_write_header. I'm not sure
this is necessary anymore. It just seems to me there could be
cases where shutdown is called while there are outstanding log
buffers.
8. In the (data)buf_lo_before_commit functions, I changed some offset
values from being calculated on the fly to being constants. That
simplified some code and we might as well let the compiler do the
calculation once rather than redoing those cycles at run time.
9. This version has my rewritten databuf_lo_add function.
This version is much more like its predecessor, buf_lo_add, which
makes it easier to understand. Again, this might not be necessary,
but it seems as if this one works as well as the previous one,
maybe even better, so I decided to leave it in.
10. In databuf_lo_before_commit, a previous data corruption problem
was caused by going off the end of the buffer. The proper solution
is to have the proper limit in place, rather than stopping earlier.
(Thus my previous attempt to fix it is wrong).
If you don't wrap the buffer, you're stopping too early and that
causes more log buffer accounting problems.
11. In lops.h there are two new (previously mentioned) constants for
figuring out the data offset for the journal buffers.
12. There are also two new functions, buf_limit and databuf_limit to
calculate how many entries will fit in the buffer.
13. In function gfs2_meta_wipe, it needs to distinguish between pinned
metadata buffers and journaled data buffers for proper journal buffer
accounting. It can't use the JDATA gfs2_inode flag because it's
sometimes passed the "real" inode and sometimes the "metadata
inode" and the inode flags will be random bits in a metadata
gfs2_inode. It needs to base its decision on which was passed in.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2007-06-18 19:50:20 +00:00
|
|
|
static void log_pull_tail(struct gfs2_sbd *sdp, unsigned int new_tail)
|
2006-01-16 16:50:04 +00:00
|
|
|
{
|
|
|
|
|
unsigned int dist = log_distance(sdp, new_tail, sdp->sd_log_tail);
|
|
|
|
|
|
|
|
|
|
ail2_empty(sdp, new_tail);
|
|
|
|
|
|
2007-11-08 14:55:03 +00:00
|
|
|
atomic_add(dist, &sdp->sd_log_blks_free);
|
2009-06-12 07:49:20 +00:00
|
|
|
trace_gfs2_log_blocks(sdp, dist);
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
gfs2_assert_withdraw(sdp, atomic_read(&sdp->sd_log_blks_free) <=
|
|
|
|
|
sdp->sd_jdesc->jd_blocks);
|
2006-01-16 16:50:04 +00:00
|
|
|
|
|
|
|
|
sdp->sd_log_tail = new_tail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2012-03-09 10:45:56 +00:00
|
|
|
static void log_flush_wait(struct gfs2_sbd *sdp)
|
2006-01-16 16:50:04 +00:00
|
|
|
{
|
2007-09-17 09:59:52 +00:00
|
|
|
DEFINE_WAIT(wait);
|
|
|
|
|
|
|
|
|
|
if (atomic_read(&sdp->sd_log_in_flight)) {
|
|
|
|
|
do {
|
|
|
|
|
prepare_to_wait(&sdp->sd_log_flush_wait, &wait,
|
|
|
|
|
TASK_UNINTERRUPTIBLE);
|
|
|
|
|
if (atomic_read(&sdp->sd_log_in_flight))
|
|
|
|
|
io_schedule();
|
|
|
|
|
} while(atomic_read(&sdp->sd_log_in_flight));
|
|
|
|
|
finish_wait(&sdp->sd_log_flush_wait, &wait);
|
2006-01-16 16:50:04 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-28 09:30:07 +00:00
|
|
|
static int ip_cmp(void *priv, struct list_head *a, struct list_head *b)
|
2012-02-14 19:49:57 +00:00
|
|
|
{
|
2013-01-28 09:30:07 +00:00
|
|
|
struct gfs2_inode *ipa, *ipb;
|
2012-02-14 19:49:57 +00:00
|
|
|
|
2013-01-28 09:30:07 +00:00
|
|
|
ipa = list_entry(a, struct gfs2_inode, i_ordered);
|
|
|
|
|
ipb = list_entry(b, struct gfs2_inode, i_ordered);
|
2012-02-14 19:49:57 +00:00
|
|
|
|
2013-01-28 09:30:07 +00:00
|
|
|
if (ipa->i_no_addr < ipb->i_no_addr)
|
2012-02-14 19:49:57 +00:00
|
|
|
return -1;
|
2013-01-28 09:30:07 +00:00
|
|
|
if (ipa->i_no_addr > ipb->i_no_addr)
|
2012-02-14 19:49:57 +00:00
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2007-09-02 09:48:13 +00:00
|
|
|
static void gfs2_ordered_write(struct gfs2_sbd *sdp)
|
|
|
|
|
{
|
2013-01-28 09:30:07 +00:00
|
|
|
struct gfs2_inode *ip;
|
2007-09-02 09:48:13 +00:00
|
|
|
LIST_HEAD(written);
|
|
|
|
|
|
2013-01-28 09:30:07 +00:00
|
|
|
spin_lock(&sdp->sd_ordered_lock);
|
|
|
|
|
list_sort(NULL, &sdp->sd_log_le_ordered, &ip_cmp);
|
2007-09-02 09:48:13 +00:00
|
|
|
while (!list_empty(&sdp->sd_log_le_ordered)) {
|
2013-01-28 09:30:07 +00:00
|
|
|
ip = list_entry(sdp->sd_log_le_ordered.next, struct gfs2_inode, i_ordered);
|
|
|
|
|
list_move(&ip->i_ordered, &written);
|
|
|
|
|
if (ip->i_inode.i_mapping->nrpages == 0)
|
2007-09-02 09:48:13 +00:00
|
|
|
continue;
|
2013-01-28 09:30:07 +00:00
|
|
|
spin_unlock(&sdp->sd_ordered_lock);
|
|
|
|
|
filemap_fdatawrite(ip->i_inode.i_mapping);
|
|
|
|
|
spin_lock(&sdp->sd_ordered_lock);
|
2007-09-02 09:48:13 +00:00
|
|
|
}
|
|
|
|
|
list_splice(&written, &sdp->sd_log_le_ordered);
|
2013-01-28 09:30:07 +00:00
|
|
|
spin_unlock(&sdp->sd_ordered_lock);
|
2007-09-02 09:48:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void gfs2_ordered_wait(struct gfs2_sbd *sdp)
|
|
|
|
|
{
|
2013-01-28 09:30:07 +00:00
|
|
|
struct gfs2_inode *ip;
|
2007-09-02 09:48:13 +00:00
|
|
|
|
2013-01-28 09:30:07 +00:00
|
|
|
spin_lock(&sdp->sd_ordered_lock);
|
2007-09-02 09:48:13 +00:00
|
|
|
while (!list_empty(&sdp->sd_log_le_ordered)) {
|
2013-01-28 09:30:07 +00:00
|
|
|
ip = list_entry(sdp->sd_log_le_ordered.next, struct gfs2_inode, i_ordered);
|
|
|
|
|
list_del(&ip->i_ordered);
|
|
|
|
|
WARN_ON(!test_and_clear_bit(GIF_ORDERED, &ip->i_flags));
|
|
|
|
|
if (ip->i_inode.i_mapping->nrpages == 0)
|
2007-09-02 09:48:13 +00:00
|
|
|
continue;
|
2013-01-28 09:30:07 +00:00
|
|
|
spin_unlock(&sdp->sd_ordered_lock);
|
|
|
|
|
filemap_fdatawait(ip->i_inode.i_mapping);
|
|
|
|
|
spin_lock(&sdp->sd_ordered_lock);
|
2007-09-02 09:48:13 +00:00
|
|
|
}
|
2013-01-28 09:30:07 +00:00
|
|
|
spin_unlock(&sdp->sd_ordered_lock);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void gfs2_ordered_del_inode(struct gfs2_inode *ip)
|
|
|
|
|
{
|
|
|
|
|
struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
|
|
|
|
|
|
|
|
|
|
spin_lock(&sdp->sd_ordered_lock);
|
|
|
|
|
if (test_and_clear_bit(GIF_ORDERED, &ip->i_flags))
|
|
|
|
|
list_del(&ip->i_ordered);
|
|
|
|
|
spin_unlock(&sdp->sd_ordered_lock);
|
2007-09-02 09:48:13 +00:00
|
|
|
}
|
|
|
|
|
|
2013-06-14 16:38:29 +00:00
|
|
|
void gfs2_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
|
|
|
|
|
{
|
|
|
|
|
struct buffer_head *bh = bd->bd_bh;
|
|
|
|
|
struct gfs2_glock *gl = bd->bd_gl;
|
|
|
|
|
|
|
|
|
|
bh->b_private = NULL;
|
|
|
|
|
bd->bd_blkno = bh->b_blocknr;
|
2013-12-10 17:06:35 +00:00
|
|
|
gfs2_remove_from_ail(bd); /* drops ref on bh */
|
|
|
|
|
bd->bd_bh = NULL;
|
2013-06-14 16:38:29 +00:00
|
|
|
bd->bd_ops = &gfs2_revoke_lops;
|
|
|
|
|
sdp->sd_log_num_revoke++;
|
|
|
|
|
atomic_inc(&gl->gl_revokes);
|
|
|
|
|
set_bit(GLF_LFLUSH, &gl->gl_flags);
|
|
|
|
|
list_add(&bd->bd_list, &sdp->sd_log_le_revoke);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void gfs2_write_revokes(struct gfs2_sbd *sdp)
|
|
|
|
|
{
|
|
|
|
|
struct gfs2_trans *tr;
|
|
|
|
|
struct gfs2_bufdata *bd, *tmp;
|
|
|
|
|
int have_revokes = 0;
|
|
|
|
|
int max_revokes = (sdp->sd_sb.sb_bsize - sizeof(struct gfs2_log_descriptor)) / sizeof(u64);
|
|
|
|
|
|
|
|
|
|
gfs2_ail1_empty(sdp);
|
|
|
|
|
spin_lock(&sdp->sd_ail_lock);
|
|
|
|
|
list_for_each_entry(tr, &sdp->sd_ail1_list, tr_list) {
|
|
|
|
|
list_for_each_entry(bd, &tr->tr_ail2_list, bd_ail_st_list) {
|
|
|
|
|
if (list_empty(&bd->bd_list)) {
|
|
|
|
|
have_revokes = 1;
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
done:
|
|
|
|
|
spin_unlock(&sdp->sd_ail_lock);
|
|
|
|
|
if (have_revokes == 0)
|
|
|
|
|
return;
|
|
|
|
|
while (sdp->sd_log_num_revoke > max_revokes)
|
|
|
|
|
max_revokes += (sdp->sd_sb.sb_bsize - sizeof(struct gfs2_meta_header)) / sizeof(u64);
|
|
|
|
|
max_revokes -= sdp->sd_log_num_revoke;
|
|
|
|
|
if (!sdp->sd_log_num_revoke) {
|
|
|
|
|
atomic_dec(&sdp->sd_log_blks_free);
|
|
|
|
|
/* If no blocks have been reserved, we need to also
|
|
|
|
|
* reserve a block for the header */
|
|
|
|
|
if (!sdp->sd_log_blks_reserved)
|
|
|
|
|
atomic_dec(&sdp->sd_log_blks_free);
|
|
|
|
|
}
|
|
|
|
|
gfs2_log_lock(sdp);
|
|
|
|
|
spin_lock(&sdp->sd_ail_lock);
|
|
|
|
|
list_for_each_entry(tr, &sdp->sd_ail1_list, tr_list) {
|
|
|
|
|
list_for_each_entry_safe(bd, tmp, &tr->tr_ail2_list, bd_ail_st_list) {
|
|
|
|
|
if (max_revokes == 0)
|
|
|
|
|
goto out_of_blocks;
|
|
|
|
|
if (!list_empty(&bd->bd_list))
|
|
|
|
|
continue;
|
|
|
|
|
gfs2_add_revoke(sdp, bd);
|
|
|
|
|
max_revokes--;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
out_of_blocks:
|
|
|
|
|
spin_unlock(&sdp->sd_ail_lock);
|
|
|
|
|
gfs2_log_unlock(sdp);
|
|
|
|
|
|
|
|
|
|
if (!sdp->sd_log_num_revoke) {
|
|
|
|
|
atomic_inc(&sdp->sd_log_blks_free);
|
|
|
|
|
if (!sdp->sd_log_blks_reserved)
|
|
|
|
|
atomic_inc(&sdp->sd_log_blks_free);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-03-09 10:45:56 +00:00
|
|
|
/**
|
|
|
|
|
* log_write_header - Get and initialize a journal header buffer
|
|
|
|
|
* @sdp: The GFS2 superblock
|
|
|
|
|
*
|
|
|
|
|
* Returns: the initialized log buffer descriptor
|
|
|
|
|
*/
|
|
|
|
|
|
2012-04-02 14:34:36 +00:00
|
|
|
static void log_write_header(struct gfs2_sbd *sdp, u32 flags)
|
2012-03-09 10:45:56 +00:00
|
|
|
{
|
|
|
|
|
struct gfs2_log_header *lh;
|
|
|
|
|
unsigned int tail;
|
|
|
|
|
u32 hash;
|
2012-04-16 08:28:31 +00:00
|
|
|
int rw = WRITE_FLUSH_FUA | REQ_META;
|
|
|
|
|
struct page *page = mempool_alloc(gfs2_page_pool, GFP_NOIO);
|
|
|
|
|
lh = page_address(page);
|
|
|
|
|
clear_page(lh);
|
2012-03-09 10:45:56 +00:00
|
|
|
|
|
|
|
|
tail = current_tail(sdp);
|
|
|
|
|
|
|
|
|
|
lh->lh_header.mh_magic = cpu_to_be32(GFS2_MAGIC);
|
|
|
|
|
lh->lh_header.mh_type = cpu_to_be32(GFS2_METATYPE_LH);
|
|
|
|
|
lh->lh_header.__pad0 = cpu_to_be64(0);
|
|
|
|
|
lh->lh_header.mh_format = cpu_to_be32(GFS2_FORMAT_LH);
|
|
|
|
|
lh->lh_header.mh_jid = cpu_to_be32(sdp->sd_jdesc->jd_jid);
|
|
|
|
|
lh->lh_sequence = cpu_to_be64(sdp->sd_log_sequence++);
|
|
|
|
|
lh->lh_flags = cpu_to_be32(flags);
|
|
|
|
|
lh->lh_tail = cpu_to_be32(tail);
|
|
|
|
|
lh->lh_blkno = cpu_to_be32(sdp->sd_log_flush_head);
|
2012-04-16 08:28:31 +00:00
|
|
|
hash = gfs2_disk_hash(page_address(page), sizeof(struct gfs2_log_header));
|
2012-03-09 10:45:56 +00:00
|
|
|
lh->lh_hash = cpu_to_be32(hash);
|
|
|
|
|
|
|
|
|
|
if (test_bit(SDF_NOBARRIERS, &sdp->sd_flags)) {
|
|
|
|
|
gfs2_ordered_wait(sdp);
|
|
|
|
|
log_flush_wait(sdp);
|
2012-04-16 08:28:31 +00:00
|
|
|
rw = WRITE_SYNC | REQ_META | REQ_PRIO;
|
2012-03-09 10:45:56 +00:00
|
|
|
}
|
|
|
|
|
|
2012-04-16 08:28:31 +00:00
|
|
|
sdp->sd_log_idle = (tail == sdp->sd_log_flush_head);
|
|
|
|
|
gfs2_log_write_page(sdp, page);
|
|
|
|
|
gfs2_log_flush_bio(sdp, rw);
|
|
|
|
|
log_flush_wait(sdp);
|
2012-03-09 10:45:56 +00:00
|
|
|
|
|
|
|
|
if (sdp->sd_log_tail != tail)
|
|
|
|
|
log_pull_tail(sdp, tail);
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-16 16:50:04 +00:00
|
|
|
/**
|
2006-04-07 15:17:32 +00:00
|
|
|
* gfs2_log_flush - flush incore transaction(s)
|
2006-01-16 16:50:04 +00:00
|
|
|
* @sdp: the filesystem
|
|
|
|
|
* @gl: The glock structure to flush. If NULL, flush the whole incore log
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
2010-05-21 03:30:11 +00:00
|
|
|
void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl)
|
2006-01-16 16:50:04 +00:00
|
|
|
{
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
struct gfs2_trans *tr;
|
2006-01-16 16:50:04 +00:00
|
|
|
|
2006-03-29 14:12:12 +00:00
|
|
|
down_write(&sdp->sd_log_flush_lock);
|
2006-02-21 12:51:39 +00:00
|
|
|
|
2007-11-08 14:25:12 +00:00
|
|
|
/* Log might have been flushed while we waited for the flush lock */
|
|
|
|
|
if (gl && !test_bit(GLF_LFLUSH, &gl->gl_flags)) {
|
|
|
|
|
up_write(&sdp->sd_log_flush_lock);
|
|
|
|
|
return;
|
2006-02-21 12:51:39 +00:00
|
|
|
}
|
2009-06-12 07:49:20 +00:00
|
|
|
trace_gfs2_log_flush(sdp, 1);
|
2006-02-21 12:51:39 +00:00
|
|
|
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
tr = sdp->sd_log_tr;
|
|
|
|
|
if (tr) {
|
|
|
|
|
sdp->sd_log_tr = NULL;
|
|
|
|
|
INIT_LIST_HEAD(&tr->tr_ail1_list);
|
|
|
|
|
INIT_LIST_HEAD(&tr->tr_ail2_list);
|
|
|
|
|
}
|
2006-01-16 16:50:04 +00:00
|
|
|
|
2007-09-17 09:59:52 +00:00
|
|
|
if (sdp->sd_log_num_buf != sdp->sd_log_commited_buf) {
|
|
|
|
|
printk(KERN_INFO "GFS2: log buf %u %u\n", sdp->sd_log_num_buf,
|
|
|
|
|
sdp->sd_log_commited_buf);
|
|
|
|
|
gfs2_assert_withdraw(sdp, 0);
|
|
|
|
|
}
|
|
|
|
|
if (sdp->sd_log_num_databuf != sdp->sd_log_commited_databuf) {
|
|
|
|
|
printk(KERN_INFO "GFS2: log databuf %u %u\n",
|
|
|
|
|
sdp->sd_log_num_databuf, sdp->sd_log_commited_databuf);
|
|
|
|
|
gfs2_assert_withdraw(sdp, 0);
|
|
|
|
|
}
|
2006-01-16 16:50:04 +00:00
|
|
|
gfs2_assert_withdraw(sdp,
|
|
|
|
|
sdp->sd_log_num_revoke == sdp->sd_log_commited_revoke);
|
|
|
|
|
|
|
|
|
|
sdp->sd_log_flush_head = sdp->sd_log_head;
|
|
|
|
|
sdp->sd_log_flush_wrapped = 0;
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
if (tr)
|
|
|
|
|
tr->tr_first = sdp->sd_log_flush_head;
|
2006-01-16 16:50:04 +00:00
|
|
|
|
2007-09-02 09:48:13 +00:00
|
|
|
gfs2_ordered_write(sdp);
|
2006-01-16 16:50:04 +00:00
|
|
|
lops_before_commit(sdp);
|
2012-04-16 08:28:31 +00:00
|
|
|
gfs2_log_flush_bio(sdp, WRITE);
|
2007-09-02 09:48:13 +00:00
|
|
|
|
2012-03-09 10:45:56 +00:00
|
|
|
if (sdp->sd_log_head != sdp->sd_log_flush_head) {
|
2012-04-02 14:34:36 +00:00
|
|
|
log_write_header(sdp, 0);
|
2012-03-09 10:45:56 +00:00
|
|
|
} else if (sdp->sd_log_tail != current_tail(sdp) && !sdp->sd_log_idle){
|
2007-11-08 14:55:03 +00:00
|
|
|
atomic_dec(&sdp->sd_log_blks_free); /* Adjust for unreserved buffer */
|
2009-06-12 07:49:20 +00:00
|
|
|
trace_gfs2_log_blocks(sdp, -1);
|
2012-04-02 14:34:36 +00:00
|
|
|
log_write_header(sdp, 0);
|
[GFS2] assertion failure after writing to journaled file, umount
This patch passes all my nasty tests that were causing the code to
fail under one circumstance or another. Here is a complete summary
of all changes from today's git tree, in order of appearance:
1. There are now separate variables for metadata buffer accounting.
2. Variable sd_log_num_hdrs is no longer needed, since the header
accounting is taken care of by the reserve/refund sequence.
3. Fixed a tiny grammatical problem in a comment.
4. Added a new function "calc_reserved" to calculate the reserved
log space. This isn't entirely necessary, but it has two benefits:
First, it simplifies the gfs2_log_refund function greatly.
Second, it allows for easier debugging because I could sprinkle the
code with calls to this function to make sure the accounting is
proper (by adding asserts and printks) at strategic point of the code.
5. In log_pull_tail there apparently was a kludge to fix up the
accounting based on a "pull" parameter. The buffer accounting is
now done properly, so the kludge was removed.
6. File sync operations were making a call to gfs2_log_flush that
writes another journal header. Since that header was unplanned
for (reserved) by the reserve/refund sequence, the free space had
to be decremented so that when log_pull_tail gets called, the free
space is be adjusted properly. (Did I hear you call that a kludge?
well, maybe, but a lot more justifiable than the one I removed).
7. In the gfs2_log_shutdown code, it optionally syncs the log by
specifying the PULL parameter to log_write_header. I'm not sure
this is necessary anymore. It just seems to me there could be
cases where shutdown is called while there are outstanding log
buffers.
8. In the (data)buf_lo_before_commit functions, I changed some offset
values from being calculated on the fly to being constants. That
simplified some code and we might as well let the compiler do the
calculation once rather than redoing those cycles at run time.
9. This version has my rewritten databuf_lo_add function.
This version is much more like its predecessor, buf_lo_add, which
makes it easier to understand. Again, this might not be necessary,
but it seems as if this one works as well as the previous one,
maybe even better, so I decided to leave it in.
10. In databuf_lo_before_commit, a previous data corruption problem
was caused by going off the end of the buffer. The proper solution
is to have the proper limit in place, rather than stopping earlier.
(Thus my previous attempt to fix it is wrong).
If you don't wrap the buffer, you're stopping too early and that
causes more log buffer accounting problems.
11. In lops.h there are two new (previously mentioned) constants for
figuring out the data offset for the journal buffers.
12. There are also two new functions, buf_limit and databuf_limit to
calculate how many entries will fit in the buffer.
13. In function gfs2_meta_wipe, it needs to distinguish between pinned
metadata buffers and journaled data buffers for proper journal buffer
accounting. It can't use the JDATA gfs2_inode flag because it's
sometimes passed the "real" inode and sometimes the "metadata
inode" and the inode flags will be random bits in a metadata
gfs2_inode. It needs to base its decision on which was passed in.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2007-06-18 19:50:20 +00:00
|
|
|
}
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
lops_after_commit(sdp, tr);
|
2006-04-07 15:17:32 +00:00
|
|
|
|
2006-10-11 17:34:59 +00:00
|
|
|
gfs2_log_lock(sdp);
|
|
|
|
|
sdp->sd_log_head = sdp->sd_log_flush_head;
|
2006-09-13 15:13:27 +00:00
|
|
|
sdp->sd_log_blks_reserved = 0;
|
|
|
|
|
sdp->sd_log_commited_buf = 0;
|
[GFS2] assertion failure after writing to journaled file, umount
This patch passes all my nasty tests that were causing the code to
fail under one circumstance or another. Here is a complete summary
of all changes from today's git tree, in order of appearance:
1. There are now separate variables for metadata buffer accounting.
2. Variable sd_log_num_hdrs is no longer needed, since the header
accounting is taken care of by the reserve/refund sequence.
3. Fixed a tiny grammatical problem in a comment.
4. Added a new function "calc_reserved" to calculate the reserved
log space. This isn't entirely necessary, but it has two benefits:
First, it simplifies the gfs2_log_refund function greatly.
Second, it allows for easier debugging because I could sprinkle the
code with calls to this function to make sure the accounting is
proper (by adding asserts and printks) at strategic point of the code.
5. In log_pull_tail there apparently was a kludge to fix up the
accounting based on a "pull" parameter. The buffer accounting is
now done properly, so the kludge was removed.
6. File sync operations were making a call to gfs2_log_flush that
writes another journal header. Since that header was unplanned
for (reserved) by the reserve/refund sequence, the free space had
to be decremented so that when log_pull_tail gets called, the free
space is be adjusted properly. (Did I hear you call that a kludge?
well, maybe, but a lot more justifiable than the one I removed).
7. In the gfs2_log_shutdown code, it optionally syncs the log by
specifying the PULL parameter to log_write_header. I'm not sure
this is necessary anymore. It just seems to me there could be
cases where shutdown is called while there are outstanding log
buffers.
8. In the (data)buf_lo_before_commit functions, I changed some offset
values from being calculated on the fly to being constants. That
simplified some code and we might as well let the compiler do the
calculation once rather than redoing those cycles at run time.
9. This version has my rewritten databuf_lo_add function.
This version is much more like its predecessor, buf_lo_add, which
makes it easier to understand. Again, this might not be necessary,
but it seems as if this one works as well as the previous one,
maybe even better, so I decided to leave it in.
10. In databuf_lo_before_commit, a previous data corruption problem
was caused by going off the end of the buffer. The proper solution
is to have the proper limit in place, rather than stopping earlier.
(Thus my previous attempt to fix it is wrong).
If you don't wrap the buffer, you're stopping too early and that
causes more log buffer accounting problems.
11. In lops.h there are two new (previously mentioned) constants for
figuring out the data offset for the journal buffers.
12. There are also two new functions, buf_limit and databuf_limit to
calculate how many entries will fit in the buffer.
13. In function gfs2_meta_wipe, it needs to distinguish between pinned
metadata buffers and journaled data buffers for proper journal buffer
accounting. It can't use the JDATA gfs2_inode flag because it's
sometimes passed the "real" inode and sometimes the "metadata
inode" and the inode flags will be random bits in a metadata
gfs2_inode. It needs to base its decision on which was passed in.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2007-06-18 19:50:20 +00:00
|
|
|
sdp->sd_log_commited_databuf = 0;
|
2006-09-13 15:13:27 +00:00
|
|
|
sdp->sd_log_commited_revoke = 0;
|
2006-01-16 16:50:04 +00:00
|
|
|
|
2011-03-11 11:52:25 +00:00
|
|
|
spin_lock(&sdp->sd_ail_lock);
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
if (tr && !list_empty(&tr->tr_ail1_list)) {
|
|
|
|
|
list_add(&tr->tr_list, &sdp->sd_ail1_list);
|
|
|
|
|
tr = NULL;
|
2006-01-16 16:50:04 +00:00
|
|
|
}
|
2011-03-11 11:52:25 +00:00
|
|
|
spin_unlock(&sdp->sd_ail_lock);
|
2006-01-16 16:50:04 +00:00
|
|
|
gfs2_log_unlock(sdp);
|
2009-06-12 07:49:20 +00:00
|
|
|
trace_gfs2_log_flush(sdp, 0);
|
2006-03-29 14:12:12 +00:00
|
|
|
up_write(&sdp->sd_log_flush_lock);
|
2006-01-16 16:50:04 +00:00
|
|
|
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
kfree(tr);
|
2006-01-16 16:50:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
|
|
|
|
|
{
|
[GFS2] assertion failure after writing to journaled file, umount
This patch passes all my nasty tests that were causing the code to
fail under one circumstance or another. Here is a complete summary
of all changes from today's git tree, in order of appearance:
1. There are now separate variables for metadata buffer accounting.
2. Variable sd_log_num_hdrs is no longer needed, since the header
accounting is taken care of by the reserve/refund sequence.
3. Fixed a tiny grammatical problem in a comment.
4. Added a new function "calc_reserved" to calculate the reserved
log space. This isn't entirely necessary, but it has two benefits:
First, it simplifies the gfs2_log_refund function greatly.
Second, it allows for easier debugging because I could sprinkle the
code with calls to this function to make sure the accounting is
proper (by adding asserts and printks) at strategic point of the code.
5. In log_pull_tail there apparently was a kludge to fix up the
accounting based on a "pull" parameter. The buffer accounting is
now done properly, so the kludge was removed.
6. File sync operations were making a call to gfs2_log_flush that
writes another journal header. Since that header was unplanned
for (reserved) by the reserve/refund sequence, the free space had
to be decremented so that when log_pull_tail gets called, the free
space is be adjusted properly. (Did I hear you call that a kludge?
well, maybe, but a lot more justifiable than the one I removed).
7. In the gfs2_log_shutdown code, it optionally syncs the log by
specifying the PULL parameter to log_write_header. I'm not sure
this is necessary anymore. It just seems to me there could be
cases where shutdown is called while there are outstanding log
buffers.
8. In the (data)buf_lo_before_commit functions, I changed some offset
values from being calculated on the fly to being constants. That
simplified some code and we might as well let the compiler do the
calculation once rather than redoing those cycles at run time.
9. This version has my rewritten databuf_lo_add function.
This version is much more like its predecessor, buf_lo_add, which
makes it easier to understand. Again, this might not be necessary,
but it seems as if this one works as well as the previous one,
maybe even better, so I decided to leave it in.
10. In databuf_lo_before_commit, a previous data corruption problem
was caused by going off the end of the buffer. The proper solution
is to have the proper limit in place, rather than stopping earlier.
(Thus my previous attempt to fix it is wrong).
If you don't wrap the buffer, you're stopping too early and that
causes more log buffer accounting problems.
11. In lops.h there are two new (previously mentioned) constants for
figuring out the data offset for the journal buffers.
12. There are also two new functions, buf_limit and databuf_limit to
calculate how many entries will fit in the buffer.
13. In function gfs2_meta_wipe, it needs to distinguish between pinned
metadata buffers and journaled data buffers for proper journal buffer
accounting. It can't use the JDATA gfs2_inode flag because it's
sometimes passed the "real" inode and sometimes the "metadata
inode" and the inode flags will be random bits in a metadata
gfs2_inode. It needs to base its decision on which was passed in.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2007-06-18 19:50:20 +00:00
|
|
|
unsigned int reserved;
|
2008-01-10 14:49:43 +00:00
|
|
|
unsigned int unused;
|
2006-01-16 16:50:04 +00:00
|
|
|
|
|
|
|
|
gfs2_log_lock(sdp);
|
|
|
|
|
|
|
|
|
|
sdp->sd_log_commited_buf += tr->tr_num_buf_new - tr->tr_num_buf_rm;
|
[GFS2] assertion failure after writing to journaled file, umount
This patch passes all my nasty tests that were causing the code to
fail under one circumstance or another. Here is a complete summary
of all changes from today's git tree, in order of appearance:
1. There are now separate variables for metadata buffer accounting.
2. Variable sd_log_num_hdrs is no longer needed, since the header
accounting is taken care of by the reserve/refund sequence.
3. Fixed a tiny grammatical problem in a comment.
4. Added a new function "calc_reserved" to calculate the reserved
log space. This isn't entirely necessary, but it has two benefits:
First, it simplifies the gfs2_log_refund function greatly.
Second, it allows for easier debugging because I could sprinkle the
code with calls to this function to make sure the accounting is
proper (by adding asserts and printks) at strategic point of the code.
5. In log_pull_tail there apparently was a kludge to fix up the
accounting based on a "pull" parameter. The buffer accounting is
now done properly, so the kludge was removed.
6. File sync operations were making a call to gfs2_log_flush that
writes another journal header. Since that header was unplanned
for (reserved) by the reserve/refund sequence, the free space had
to be decremented so that when log_pull_tail gets called, the free
space is be adjusted properly. (Did I hear you call that a kludge?
well, maybe, but a lot more justifiable than the one I removed).
7. In the gfs2_log_shutdown code, it optionally syncs the log by
specifying the PULL parameter to log_write_header. I'm not sure
this is necessary anymore. It just seems to me there could be
cases where shutdown is called while there are outstanding log
buffers.
8. In the (data)buf_lo_before_commit functions, I changed some offset
values from being calculated on the fly to being constants. That
simplified some code and we might as well let the compiler do the
calculation once rather than redoing those cycles at run time.
9. This version has my rewritten databuf_lo_add function.
This version is much more like its predecessor, buf_lo_add, which
makes it easier to understand. Again, this might not be necessary,
but it seems as if this one works as well as the previous one,
maybe even better, so I decided to leave it in.
10. In databuf_lo_before_commit, a previous data corruption problem
was caused by going off the end of the buffer. The proper solution
is to have the proper limit in place, rather than stopping earlier.
(Thus my previous attempt to fix it is wrong).
If you don't wrap the buffer, you're stopping too early and that
causes more log buffer accounting problems.
11. In lops.h there are two new (previously mentioned) constants for
figuring out the data offset for the journal buffers.
12. There are also two new functions, buf_limit and databuf_limit to
calculate how many entries will fit in the buffer.
13. In function gfs2_meta_wipe, it needs to distinguish between pinned
metadata buffers and journaled data buffers for proper journal buffer
accounting. It can't use the JDATA gfs2_inode flag because it's
sometimes passed the "real" inode and sometimes the "metadata
inode" and the inode flags will be random bits in a metadata
gfs2_inode. It needs to base its decision on which was passed in.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2007-06-18 19:50:20 +00:00
|
|
|
sdp->sd_log_commited_databuf += tr->tr_num_databuf_new -
|
|
|
|
|
tr->tr_num_databuf_rm;
|
|
|
|
|
gfs2_assert_withdraw(sdp, (((int)sdp->sd_log_commited_buf) >= 0) ||
|
|
|
|
|
(((int)sdp->sd_log_commited_databuf) >= 0));
|
2006-01-16 16:50:04 +00:00
|
|
|
sdp->sd_log_commited_revoke += tr->tr_num_revoke - tr->tr_num_revoke_rm;
|
[GFS2] assertion failure after writing to journaled file, umount
This patch passes all my nasty tests that were causing the code to
fail under one circumstance or another. Here is a complete summary
of all changes from today's git tree, in order of appearance:
1. There are now separate variables for metadata buffer accounting.
2. Variable sd_log_num_hdrs is no longer needed, since the header
accounting is taken care of by the reserve/refund sequence.
3. Fixed a tiny grammatical problem in a comment.
4. Added a new function "calc_reserved" to calculate the reserved
log space. This isn't entirely necessary, but it has two benefits:
First, it simplifies the gfs2_log_refund function greatly.
Second, it allows for easier debugging because I could sprinkle the
code with calls to this function to make sure the accounting is
proper (by adding asserts and printks) at strategic point of the code.
5. In log_pull_tail there apparently was a kludge to fix up the
accounting based on a "pull" parameter. The buffer accounting is
now done properly, so the kludge was removed.
6. File sync operations were making a call to gfs2_log_flush that
writes another journal header. Since that header was unplanned
for (reserved) by the reserve/refund sequence, the free space had
to be decremented so that when log_pull_tail gets called, the free
space is be adjusted properly. (Did I hear you call that a kludge?
well, maybe, but a lot more justifiable than the one I removed).
7. In the gfs2_log_shutdown code, it optionally syncs the log by
specifying the PULL parameter to log_write_header. I'm not sure
this is necessary anymore. It just seems to me there could be
cases where shutdown is called while there are outstanding log
buffers.
8. In the (data)buf_lo_before_commit functions, I changed some offset
values from being calculated on the fly to being constants. That
simplified some code and we might as well let the compiler do the
calculation once rather than redoing those cycles at run time.
9. This version has my rewritten databuf_lo_add function.
This version is much more like its predecessor, buf_lo_add, which
makes it easier to understand. Again, this might not be necessary,
but it seems as if this one works as well as the previous one,
maybe even better, so I decided to leave it in.
10. In databuf_lo_before_commit, a previous data corruption problem
was caused by going off the end of the buffer. The proper solution
is to have the proper limit in place, rather than stopping earlier.
(Thus my previous attempt to fix it is wrong).
If you don't wrap the buffer, you're stopping too early and that
causes more log buffer accounting problems.
11. In lops.h there are two new (previously mentioned) constants for
figuring out the data offset for the journal buffers.
12. There are also two new functions, buf_limit and databuf_limit to
calculate how many entries will fit in the buffer.
13. In function gfs2_meta_wipe, it needs to distinguish between pinned
metadata buffers and journaled data buffers for proper journal buffer
accounting. It can't use the JDATA gfs2_inode flag because it's
sometimes passed the "real" inode and sometimes the "metadata
inode" and the inode flags will be random bits in a metadata
gfs2_inode. It needs to base its decision on which was passed in.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2007-06-18 19:50:20 +00:00
|
|
|
reserved = calc_reserved(sdp);
|
2008-04-17 15:25:37 +00:00
|
|
|
gfs2_assert_withdraw(sdp, sdp->sd_log_blks_reserved + tr->tr_reserved >= reserved);
|
2008-01-10 14:49:43 +00:00
|
|
|
unused = sdp->sd_log_blks_reserved - reserved + tr->tr_reserved;
|
|
|
|
|
atomic_add(unused, &sdp->sd_log_blks_free);
|
2009-06-12 07:49:20 +00:00
|
|
|
trace_gfs2_log_blocks(sdp, unused);
|
2007-11-08 14:55:03 +00:00
|
|
|
gfs2_assert_withdraw(sdp, atomic_read(&sdp->sd_log_blks_free) <=
|
[GFS2] assertion failure after writing to journaled file, umount
This patch passes all my nasty tests that were causing the code to
fail under one circumstance or another. Here is a complete summary
of all changes from today's git tree, in order of appearance:
1. There are now separate variables for metadata buffer accounting.
2. Variable sd_log_num_hdrs is no longer needed, since the header
accounting is taken care of by the reserve/refund sequence.
3. Fixed a tiny grammatical problem in a comment.
4. Added a new function "calc_reserved" to calculate the reserved
log space. This isn't entirely necessary, but it has two benefits:
First, it simplifies the gfs2_log_refund function greatly.
Second, it allows for easier debugging because I could sprinkle the
code with calls to this function to make sure the accounting is
proper (by adding asserts and printks) at strategic point of the code.
5. In log_pull_tail there apparently was a kludge to fix up the
accounting based on a "pull" parameter. The buffer accounting is
now done properly, so the kludge was removed.
6. File sync operations were making a call to gfs2_log_flush that
writes another journal header. Since that header was unplanned
for (reserved) by the reserve/refund sequence, the free space had
to be decremented so that when log_pull_tail gets called, the free
space is be adjusted properly. (Did I hear you call that a kludge?
well, maybe, but a lot more justifiable than the one I removed).
7. In the gfs2_log_shutdown code, it optionally syncs the log by
specifying the PULL parameter to log_write_header. I'm not sure
this is necessary anymore. It just seems to me there could be
cases where shutdown is called while there are outstanding log
buffers.
8. In the (data)buf_lo_before_commit functions, I changed some offset
values from being calculated on the fly to being constants. That
simplified some code and we might as well let the compiler do the
calculation once rather than redoing those cycles at run time.
9. This version has my rewritten databuf_lo_add function.
This version is much more like its predecessor, buf_lo_add, which
makes it easier to understand. Again, this might not be necessary,
but it seems as if this one works as well as the previous one,
maybe even better, so I decided to leave it in.
10. In databuf_lo_before_commit, a previous data corruption problem
was caused by going off the end of the buffer. The proper solution
is to have the proper limit in place, rather than stopping earlier.
(Thus my previous attempt to fix it is wrong).
If you don't wrap the buffer, you're stopping too early and that
causes more log buffer accounting problems.
11. In lops.h there are two new (previously mentioned) constants for
figuring out the data offset for the journal buffers.
12. There are also two new functions, buf_limit and databuf_limit to
calculate how many entries will fit in the buffer.
13. In function gfs2_meta_wipe, it needs to distinguish between pinned
metadata buffers and journaled data buffers for proper journal buffer
accounting. It can't use the JDATA gfs2_inode flag because it's
sometimes passed the "real" inode and sometimes the "metadata
inode" and the inode flags will be random bits in a metadata
gfs2_inode. It needs to base its decision on which was passed in.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2007-06-18 19:50:20 +00:00
|
|
|
sdp->sd_jdesc->jd_blocks);
|
2006-01-16 16:50:04 +00:00
|
|
|
sdp->sd_log_blks_reserved = reserved;
|
|
|
|
|
|
GFS2: replace gfs2_ail structure with gfs2_trans
In order to allow transactions and log flushes to happen at the same
time, gfs2 needs to move the transaction accounting and active items
list code into the gfs2_trans structure. As a first step toward this,
this patch removes the gfs2_ail structure, and handles the active items
list in the gfs_trans structure. This keeps gfs2 from allocating an ail
structure on log flushes, and gives us a struture that can later be used
to store the transaction accounting outside of the gfs2 superblock
structure.
With this patch, at the end of a transaction, gfs2 will add the
gfs2_trans structure to the superblock if there is not one already.
This structure now has the active items fields that were previously in
gfs2_ail. This is not necessary in the case where the transaction was
simply used to add revokes, since these are never written outside of the
journal, and thus, don't need an active items list.
Also, in order to make sure that the transaction structure is not
removed while it's still in use by gfs2_trans_end, unlocking the
sd_log_flush_lock has to happen slightly later in ending the
transaction.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2013-04-06 01:31:46 +00:00
|
|
|
if (sdp->sd_log_tr == NULL &&
|
|
|
|
|
(tr->tr_num_buf_new || tr->tr_num_databuf_new)) {
|
|
|
|
|
gfs2_assert_withdraw(sdp, tr->tr_t_gh.gh_gl);
|
|
|
|
|
sdp->sd_log_tr = tr;
|
|
|
|
|
tr->tr_attached = 1;
|
|
|
|
|
}
|
2006-01-16 16:50:04 +00:00
|
|
|
gfs2_log_unlock(sdp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* gfs2_log_commit - Commit a transaction to the log
|
|
|
|
|
* @sdp: the filesystem
|
|
|
|
|
* @tr: the transaction
|
|
|
|
|
*
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
* We wake up gfs2_logd if the number of pinned blocks exceed thresh1
|
|
|
|
|
* or the total number of used blocks (pinned blocks plus AIL blocks)
|
|
|
|
|
* is greater than thresh2.
|
|
|
|
|
*
|
|
|
|
|
* At mount time thresh1 is 1/3rd of journal size, thresh2 is 2/3rd of
|
|
|
|
|
* journal size.
|
|
|
|
|
*
|
2006-01-16 16:50:04 +00:00
|
|
|
* Returns: errno
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void gfs2_log_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
|
|
|
|
|
{
|
|
|
|
|
log_refund(sdp, tr);
|
|
|
|
|
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
if (atomic_read(&sdp->sd_log_pinned) > atomic_read(&sdp->sd_log_thresh1) ||
|
|
|
|
|
((sdp->sd_jdesc->jd_blocks - atomic_read(&sdp->sd_log_blks_free)) >
|
|
|
|
|
atomic_read(&sdp->sd_log_thresh2)))
|
|
|
|
|
wake_up(&sdp->sd_logd_waitq);
|
2006-01-16 16:50:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* gfs2_log_shutdown - write a shutdown header into a journal
|
|
|
|
|
* @sdp: the filesystem
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void gfs2_log_shutdown(struct gfs2_sbd *sdp)
|
|
|
|
|
{
|
2006-03-29 14:12:12 +00:00
|
|
|
down_write(&sdp->sd_log_flush_lock);
|
2006-01-16 16:50:04 +00:00
|
|
|
|
|
|
|
|
gfs2_assert_withdraw(sdp, !sdp->sd_log_blks_reserved);
|
|
|
|
|
gfs2_assert_withdraw(sdp, !sdp->sd_log_num_buf);
|
|
|
|
|
gfs2_assert_withdraw(sdp, !sdp->sd_log_num_revoke);
|
|
|
|
|
gfs2_assert_withdraw(sdp, !sdp->sd_log_num_rg);
|
|
|
|
|
gfs2_assert_withdraw(sdp, !sdp->sd_log_num_databuf);
|
|
|
|
|
gfs2_assert_withdraw(sdp, list_empty(&sdp->sd_ail1_list));
|
|
|
|
|
|
|
|
|
|
sdp->sd_log_flush_head = sdp->sd_log_head;
|
|
|
|
|
sdp->sd_log_flush_wrapped = 0;
|
|
|
|
|
|
2012-04-02 14:34:36 +00:00
|
|
|
log_write_header(sdp, GFS2_LOG_HEAD_UNMOUNT);
|
2006-01-16 16:50:04 +00:00
|
|
|
|
2007-11-08 14:55:03 +00:00
|
|
|
gfs2_assert_warn(sdp, atomic_read(&sdp->sd_log_blks_free) == sdp->sd_jdesc->jd_blocks);
|
2006-04-21 19:10:46 +00:00
|
|
|
gfs2_assert_warn(sdp, sdp->sd_log_head == sdp->sd_log_tail);
|
|
|
|
|
gfs2_assert_warn(sdp, list_empty(&sdp->sd_ail2_list));
|
2006-01-16 16:50:04 +00:00
|
|
|
|
|
|
|
|
sdp->sd_log_head = sdp->sd_log_flush_head;
|
|
|
|
|
sdp->sd_log_tail = sdp->sd_log_head;
|
|
|
|
|
|
2006-03-29 14:12:12 +00:00
|
|
|
up_write(&sdp->sd_log_flush_lock);
|
2006-01-16 16:50:04 +00:00
|
|
|
}
|
|
|
|
|
|
2006-11-23 16:06:35 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* gfs2_meta_syncfs - sync all the buffers in a filesystem
|
|
|
|
|
* @sdp: the filesystem
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void gfs2_meta_syncfs(struct gfs2_sbd *sdp)
|
|
|
|
|
{
|
|
|
|
|
gfs2_log_flush(sdp, NULL);
|
|
|
|
|
for (;;) {
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
gfs2_ail1_start(sdp);
|
2011-05-21 18:21:07 +00:00
|
|
|
gfs2_ail1_wait(sdp);
|
2011-04-18 13:18:09 +00:00
|
|
|
if (gfs2_ail1_empty(sdp))
|
2006-11-23 16:06:35 +00:00
|
|
|
break;
|
|
|
|
|
}
|
2011-07-14 07:59:44 +00:00
|
|
|
gfs2_log_flush(sdp, NULL);
|
2006-11-23 16:06:35 +00:00
|
|
|
}
|
|
|
|
|
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
static inline int gfs2_jrnl_flush_reqd(struct gfs2_sbd *sdp)
|
|
|
|
|
{
|
|
|
|
|
return (atomic_read(&sdp->sd_log_pinned) >= atomic_read(&sdp->sd_log_thresh1));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline int gfs2_ail_flush_reqd(struct gfs2_sbd *sdp)
|
|
|
|
|
{
|
|
|
|
|
unsigned int used_blocks = sdp->sd_jdesc->jd_blocks - atomic_read(&sdp->sd_log_blks_free);
|
|
|
|
|
return used_blocks >= atomic_read(&sdp->sd_log_thresh2);
|
|
|
|
|
}
|
2007-11-09 10:01:41 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* gfs2_logd - Update log tail as Active Items get flushed to in-place blocks
|
|
|
|
|
* @sdp: Pointer to GFS2 superblock
|
|
|
|
|
*
|
|
|
|
|
* Also, periodically check to make sure that we're using the most recent
|
|
|
|
|
* journal index.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int gfs2_logd(void *data)
|
|
|
|
|
{
|
|
|
|
|
struct gfs2_sbd *sdp = data;
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
unsigned long t = 1;
|
|
|
|
|
DEFINE_WAIT(wait);
|
2007-11-09 10:01:41 +00:00
|
|
|
|
|
|
|
|
while (!kthread_should_stop()) {
|
|
|
|
|
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
if (gfs2_jrnl_flush_reqd(sdp) || t == 0) {
|
2011-04-18 13:18:09 +00:00
|
|
|
gfs2_ail1_empty(sdp);
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
gfs2_log_flush(sdp, NULL);
|
|
|
|
|
}
|
2007-11-09 10:01:41 +00:00
|
|
|
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
if (gfs2_ail_flush_reqd(sdp)) {
|
|
|
|
|
gfs2_ail1_start(sdp);
|
2011-05-21 18:21:07 +00:00
|
|
|
gfs2_ail1_wait(sdp);
|
2011-04-18 13:18:09 +00:00
|
|
|
gfs2_ail1_empty(sdp);
|
2007-11-09 10:01:41 +00:00
|
|
|
gfs2_log_flush(sdp, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-21 18:21:07 +00:00
|
|
|
if (!gfs2_ail_flush_reqd(sdp))
|
|
|
|
|
wake_up(&sdp->sd_log_waitq);
|
|
|
|
|
|
2007-11-09 10:01:41 +00:00
|
|
|
t = gfs2_tune_get(sdp, gt_logd_secs) * HZ;
|
2011-11-21 20:32:22 +00:00
|
|
|
|
|
|
|
|
try_to_freeze();
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
prepare_to_wait(&sdp->sd_logd_waitq, &wait,
|
2010-09-09 13:45:00 +00:00
|
|
|
TASK_INTERRUPTIBLE);
|
GFS2: Various gfs2_logd improvements
This patch contains various tweaks to how log flushes and active item writeback
work. gfs2_logd is now managed by a waitqueue, and gfs2_log_reseve now waits
for gfs2_logd to do the log flushing. Multiple functions were rewritten to
remove the need to call gfs2_log_lock(). Instead of using one test to see if
gfs2_logd had work to do, there are now seperate tests to check if there
are two many buffers in the incore log or if there are two many items on the
active items list.
This patch is a port of a patch Steve Whitehouse wrote about a year ago, with
some minor changes. Since gfs2_ail1_start always submits all the active items,
it no longer needs to keep track of the first ai submitted, so this has been
removed. In gfs2_log_reserve(), the order of the calls to
prepare_to_wait_exclusive() and wake_up() when firing off the logd thread has
been switched. If it called wake_up first there was a small window for a race,
where logd could run and return before gfs2_log_reserve was ready to get woken
up. If gfs2_logd ran, but did not free up enough blocks, gfs2_log_reserve()
would be left waiting for gfs2_logd to eventualy run because it timed out.
Finally, gt_logd_secs, which controls how long to wait before gfs2_logd times
out, and flushes the log, can now be set on mount with ar_commit.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2010-05-04 19:29:16 +00:00
|
|
|
if (!gfs2_ail_flush_reqd(sdp) &&
|
|
|
|
|
!gfs2_jrnl_flush_reqd(sdp) &&
|
|
|
|
|
!kthread_should_stop())
|
|
|
|
|
t = schedule_timeout(t);
|
|
|
|
|
} while(t && !gfs2_ail_flush_reqd(sdp) &&
|
|
|
|
|
!gfs2_jrnl_flush_reqd(sdp) &&
|
|
|
|
|
!kthread_should_stop());
|
|
|
|
|
finish_wait(&sdp->sd_logd_waitq, &wait);
|
2007-11-09 10:01:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
