2006-01-16 19:50:04 +03:00
/*
* Copyright ( C ) Sistina Software , Inc . 1997 - 2003 All rights reserved .
2007-12-12 03:49:21 +03:00
* Copyright ( C ) 2004 - 2007 Red Hat , Inc . All rights reserved .
2006-01-16 19:50:04 +03: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 19:05:15 +04:00
* of the GNU General Public License version 2.
2006-01-16 19:50:04 +03:00
*/
# include <linux/sched.h>
# include <linux/slab.h>
# include <linux/spinlock.h>
# include <linux/completion.h>
# include <linux/buffer_head.h>
2006-02-28 01:23:27 +03:00
# include <linux/gfs2_ondisk.h>
2006-03-28 23:14:04 +04:00
# include <linux/crc32.h>
2006-11-23 19:06:35 +03:00
# include <linux/delay.h>
2007-11-09 13:01:41 +03:00
# include <linux/kthread.h>
# include <linux/freezer.h>
2008-09-26 13:23:22 +04:00
# include <linux/bio.h>
2006-01-16 19:50:04 +03:00
# include "gfs2.h"
2006-02-28 01:23:27 +03:00
# include "incore.h"
2006-01-16 19:50:04 +03:00
# include "bmap.h"
# include "glock.h"
# include "log.h"
# include "lops.h"
# include "meta_io.h"
2006-02-28 01:23:27 +03:00
# include "util.h"
2006-03-28 23:14:04 +04:00
# include "dir.h"
2009-06-12 11:49:20 +04:00
# include "trace_gfs2.h"
2006-01-16 19:50:04 +03:00
# define PULL 1
/**
* 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 19:13:27 +04:00
first = ( sdp - > sd_sb . sb_bsize - sizeof ( struct gfs2_log_descriptor ) ) / ssize ;
2006-01-16 19:50:04 +03:00
if ( nstruct > first ) {
2006-02-27 20:00:42 +03:00
second = ( sdp - > sd_sb . sb_bsize -
sizeof ( struct gfs2_meta_header ) ) / ssize ;
2006-02-28 01:23:27 +03:00
blks + = DIV_ROUND_UP ( nstruct - first , second ) ;
2006-01-16 19:50:04 +03:00
}
return blks ;
}
2007-08-27 12:45:26 +04: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
*
* The log lock _must_ be held when calling this function
*
*/
2007-10-15 19:29:05 +04:00
void gfs2_remove_from_ail ( struct gfs2_bufdata * bd )
2007-08-27 12:45:26 +04:00
{
bd - > bd_ail = NULL ;
2007-09-03 14:01:33 +04:00
list_del_init ( & bd - > bd_ail_st_list ) ;
list_del_init ( & bd - > bd_ail_gl_list ) ;
2007-08-27 12:45:26 +04:00
atomic_dec ( & bd - > bd_gl - > gl_ail_count ) ;
brelse ( bd - > bd_bh ) ;
}
2006-10-03 19:10:41 +04:00
/**
* gfs2_ail1_start_one - Start I / O on a part of the AIL
* @ sdp : the filesystem
* @ tr : the part of the AIL
*
*/
static void gfs2_ail1_start_one ( struct gfs2_sbd * sdp , struct gfs2_ail * ai )
2008-05-30 05:27:51 +04:00
__releases ( & sdp - > sd_log_lock )
__acquires ( & sdp - > sd_log_lock )
2006-10-03 19:10:41 +04:00
{
struct gfs2_bufdata * bd , * s ;
struct buffer_head * bh ;
int retry ;
do {
retry = 0 ;
list_for_each_entry_safe_reverse ( bd , s , & ai - > ai_ail1_list ,
bd_ail_st_list ) {
bh = bd - > bd_bh ;
gfs2_assert ( sdp , bd - > bd_ail = = ai ) ;
if ( ! buffer_busy ( bh ) ) {
2007-09-17 13:59:52 +04:00
if ( ! buffer_uptodate ( bh ) )
2006-10-03 19:10:41 +04:00
gfs2_io_error_bh ( sdp , bh ) ;
list_move ( & bd - > bd_ail_st_list , & ai - > ai_ail2_list ) ;
continue ;
}
if ( ! buffer_dirty ( bh ) )
continue ;
list_move ( & bd - > bd_ail_st_list , & ai - > ai_ail1_list ) ;
2007-09-17 13:59:52 +04:00
get_bh ( bh ) ;
2006-10-03 19:10:41 +04:00
gfs2_log_unlock ( sdp ) ;
2007-09-17 13:59:52 +04:00
lock_buffer ( bh ) ;
if ( test_clear_buffer_dirty ( bh ) ) {
bh - > b_end_io = end_buffer_write_sync ;
2009-04-07 17:13:01 +04:00
submit_bh ( WRITE_SYNC_PLUG , bh ) ;
2007-09-17 13:59:52 +04:00
} else {
unlock_buffer ( bh ) ;
brelse ( bh ) ;
}
2006-10-03 19:10:41 +04:00
gfs2_log_lock ( sdp ) ;
retry = 1 ;
break ;
}
} while ( retry ) ;
}
/**
* gfs2_ail1_empty_one - Check whether or not a trans in the AIL has been synced
* @ sdp : the filesystem
* @ ai : the AIL entry
*
*/
static int gfs2_ail1_empty_one ( struct gfs2_sbd * sdp , struct gfs2_ail * ai , int flags )
{
struct gfs2_bufdata * bd , * s ;
struct buffer_head * bh ;
list_for_each_entry_safe_reverse ( bd , s , & ai - > ai_ail1_list ,
bd_ail_st_list ) {
bh = bd - > bd_bh ;
gfs2_assert ( sdp , bd - > bd_ail = = ai ) ;
if ( buffer_busy ( bh ) ) {
if ( flags & DIO_ALL )
continue ;
else
break ;
}
if ( ! buffer_uptodate ( bh ) )
gfs2_io_error_bh ( sdp , bh ) ;
list_move ( & bd - > bd_ail_st_list , & ai - > ai_ail2_list ) ;
}
return list_empty ( & ai - > ai_ail1_list ) ;
}
2006-11-23 19:06:35 +03:00
static void gfs2_ail1_start ( struct gfs2_sbd * sdp , int flags )
2006-01-16 19:50:04 +03:00
{
2007-07-24 23:07:33 +04:00
struct list_head * head ;
2006-09-04 20:49:07 +04:00
u64 sync_gen ;
2006-09-19 19:17:38 +04:00
struct list_head * first ;
struct gfs2_ail * first_ai , * ai , * tmp ;
int done = 0 ;
2006-01-16 19:50:04 +03:00
gfs2_log_lock ( sdp ) ;
2007-07-24 23:07:33 +04:00
head = & sdp - > sd_ail1_list ;
2006-01-16 19:50:04 +03:00
if ( list_empty ( head ) ) {
gfs2_log_unlock ( sdp ) ;
return ;
}
sync_gen = sdp - > sd_ail_sync_gen + + ;
first = head - > prev ;
first_ai = list_entry ( first , struct gfs2_ail , ai_list ) ;
first_ai - > ai_sync_gen = sync_gen ;
2006-09-19 19:17:38 +04:00
gfs2_ail1_start_one ( sdp , first_ai ) ; /* This may drop log lock */
2006-01-16 19:50:04 +03:00
if ( flags & DIO_ALL )
first = NULL ;
2006-09-19 19:17:38 +04:00
while ( ! done ) {
2006-03-29 18:12:12 +04:00
if ( first & & ( head - > prev ! = first | |
gfs2_ail1_empty_one ( sdp , first_ai , 0 ) ) )
2006-01-16 19:50:04 +03:00
break ;
2006-09-19 19:17:38 +04:00
done = 1 ;
list_for_each_entry_safe_reverse ( ai , tmp , head , ai_list ) {
2006-01-16 19:50:04 +03:00
if ( ai - > ai_sync_gen > = sync_gen )
continue ;
ai - > ai_sync_gen = sync_gen ;
2006-09-19 19:17:38 +04:00
gfs2_ail1_start_one ( sdp , ai ) ; /* This may drop log lock */
done = 0 ;
2006-01-16 19:50:04 +03:00
break ;
}
}
gfs2_log_unlock ( sdp ) ;
}
2007-11-09 13:01:41 +03:00
static int gfs2_ail1_empty ( struct gfs2_sbd * sdp , int flags )
2006-01-16 19:50:04 +03:00
{
struct gfs2_ail * ai , * s ;
int ret ;
gfs2_log_lock ( sdp ) ;
list_for_each_entry_safe_reverse ( ai , s , & sdp - > sd_ail1_list , ai_list ) {
if ( gfs2_ail1_empty_one ( sdp , ai , flags ) )
list_move ( & ai - > ai_list , & sdp - > sd_ail2_list ) ;
else if ( ! ( flags & DIO_ALL ) )
break ;
}
ret = list_empty ( & sdp - > sd_ail1_list ) ;
gfs2_log_unlock ( sdp ) ;
return ret ;
}
2006-10-03 19:10:41 +04:00
/**
* gfs2_ail2_empty_one - Check whether or not a trans in the AIL has been synced
* @ sdp : the filesystem
* @ ai : the AIL entry
*
*/
static void gfs2_ail2_empty_one ( struct gfs2_sbd * sdp , struct gfs2_ail * ai )
{
struct list_head * head = & ai - > ai_ail2_list ;
struct gfs2_bufdata * bd ;
while ( ! list_empty ( head ) ) {
bd = list_entry ( head - > prev , struct gfs2_bufdata ,
bd_ail_st_list ) ;
gfs2_assert ( sdp , bd - > bd_ail = = ai ) ;
2007-10-15 19:29:05 +04:00
gfs2_remove_from_ail ( bd ) ;
2006-10-03 19:10:41 +04:00
}
}
2006-01-16 19:50:04 +03:00
static void ail2_empty ( struct gfs2_sbd * sdp , unsigned int new_tail )
{
struct gfs2_ail * ai , * safe ;
unsigned int old_tail = sdp - > sd_log_tail ;
int wrap = ( new_tail < old_tail ) ;
int a , b , rm ;
gfs2_log_lock ( sdp ) ;
list_for_each_entry_safe ( ai , safe , & sdp - > sd_ail2_list , ai_list ) {
a = ( old_tail < = ai - > ai_first ) ;
b = ( ai - > ai_first < new_tail ) ;
rm = ( wrap ) ? ( a | | b ) : ( a & & b ) ;
if ( ! rm )
continue ;
gfs2_ail2_empty_one ( sdp , ai ) ;
list_del ( & ai - > ai_list ) ;
gfs2_assert_warn ( sdp , list_empty ( & ai - > ai_ail1_list ) ) ;
gfs2_assert_warn ( sdp , list_empty ( & ai - > ai_ail2_list ) ) ;
kfree ( ai ) ;
}
gfs2_log_unlock ( sdp ) ;
}
/**
* gfs2_log_reserve - Make a log reservation
* @ sdp : The GFS2 superblock
* @ blks : The number of blocks to reserve
*
2007-06-01 18:19:33 +04: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 23:50:20 +04:00
* due to the fact that there is a small number of header blocks
2006-11-23 18:51:34 +03: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 .
*
2006-01-16 19:50:04 +03:00
* Returns : errno
*/
int gfs2_log_reserve ( struct gfs2_sbd * sdp , unsigned int blks )
{
unsigned int try = 0 ;
2007-06-01 18:19:33 +04:00
unsigned reserved_blks = 6 * ( 4096 / sdp - > sd_vfs - > s_blocksize ) ;
2006-01-16 19:50:04 +03:00
if ( gfs2_assert_warn ( sdp , blks ) | |
gfs2_assert_warn ( sdp , blks < = sdp - > sd_jdesc - > jd_blocks ) )
return - EINVAL ;
2006-03-28 23:14:04 +04:00
mutex_lock ( & sdp - > sd_log_reserve_mutex ) ;
2006-03-29 18:12:12 +04:00
gfs2_log_lock ( sdp ) ;
2007-11-08 17:55:03 +03:00
while ( atomic_read ( & sdp - > sd_log_blks_free ) < = ( blks + reserved_blks ) ) {
2006-01-16 19:50:04 +03:00
gfs2_log_unlock ( sdp ) ;
gfs2_ail1_empty ( sdp , 0 ) ;
2006-04-07 19:17:32 +04:00
gfs2_log_flush ( sdp , NULL ) ;
2006-01-16 19:50:04 +03:00
if ( try + + )
gfs2_ail1_start ( sdp , 0 ) ;
2006-03-29 18:12:12 +04:00
gfs2_log_lock ( sdp ) ;
2006-01-16 19:50:04 +03:00
}
2007-11-08 17:55:03 +03:00
atomic_sub ( blks , & sdp - > sd_log_blks_free ) ;
2009-06-12 11:49:20 +04:00
trace_gfs2_log_blocks ( sdp , - blks ) ;
2006-03-29 18:12:12 +04:00
gfs2_log_unlock ( sdp ) ;
mutex_unlock ( & sdp - > sd_log_reserve_mutex ) ;
down_read ( & sdp - > sd_log_flush_lock ) ;
2006-01-16 19:50:04 +03:00
return 0 ;
}
/**
* gfs2_log_release - Release a given number of log blocks
* @ sdp : The GFS2 superblock
* @ blks : The number of blocks
*
*/
void gfs2_log_release ( struct gfs2_sbd * sdp , unsigned int blks )
{
gfs2_log_lock ( sdp ) ;
2007-11-08 17:55:03 +03:00
atomic_add ( blks , & sdp - > sd_log_blks_free ) ;
2009-06-12 11:49:20 +04:00
trace_gfs2_log_blocks ( sdp , blks ) ;
2006-01-16 19:50:04 +03:00
gfs2_assert_withdraw ( sdp ,
2007-11-08 17:55:03 +03:00
atomic_read ( & sdp - > sd_log_blks_free ) < = sdp - > sd_jdesc - > jd_blocks ) ;
2006-01-16 19:50:04 +03:00
gfs2_log_unlock ( sdp ) ;
2006-04-08 00:28:07 +04:00
up_read ( & sdp - > sd_log_flush_lock ) ;
2006-01-16 19:50:04 +03:00
}
2006-09-04 20:49:07 +04:00
static u64 log_bmap ( struct gfs2_sbd * sdp , unsigned int lbn )
2006-01-16 19:50:04 +03:00
{
2007-12-12 03:49:21 +03:00
struct gfs2_journal_extent * je ;
list_for_each_entry ( je , & sdp - > sd_jdesc - > extent_list , extent_list ) {
if ( lbn > = je - > lblock & & lbn < je - > lblock + je - > blocks )
2007-12-14 17:04:34 +03:00
return je - > dblock + lbn - je - > lblock ;
2007-12-12 03:49:21 +03:00
}
return - 1 ;
2006-01-16 19:50:04 +03:00
}
/**
* 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 19:13:27 +04:00
static inline unsigned int log_distance ( struct gfs2_sbd * sdp , unsigned int newer ,
2006-01-16 19:50:04 +03: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 23:50:20 +04: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 03:10:19 +03: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 23:50:20 +04: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 19:50:04 +03:00
static unsigned int current_tail ( struct gfs2_sbd * sdp )
{
struct gfs2_ail * ai ;
unsigned int tail ;
gfs2_log_lock ( sdp ) ;
2006-09-13 19:13:27 +04:00
if ( list_empty ( & sdp - > sd_ail1_list ) ) {
2006-01-16 19:50:04 +03:00
tail = sdp - > sd_log_head ;
2006-09-13 19:13:27 +04:00
} else {
ai = list_entry ( sdp - > sd_ail1_list . prev , struct gfs2_ail , ai_list ) ;
2006-01-16 19:50:04 +03:00
tail = ai - > ai_first ;
}
gfs2_log_unlock ( sdp ) ;
return tail ;
}
2007-09-17 13:59:52 +04:00
void gfs2_log_incr_head ( struct gfs2_sbd * sdp )
2006-01-16 19:50:04 +03:00
{
if ( sdp - > sd_log_flush_head = = sdp - > sd_log_tail )
2007-09-17 13:59:52 +04:00
BUG_ON ( sdp - > sd_log_flush_head ! = sdp - > sd_log_head ) ;
2006-01-16 19:50:04 +03:00
if ( + + sdp - > sd_log_flush_head = = sdp - > sd_jdesc - > jd_blocks ) {
sdp - > sd_log_flush_head = 0 ;
sdp - > sd_log_flush_wrapped = 1 ;
}
}
2007-09-17 13:59:52 +04:00
/**
* gfs2_log_write_endio - End of I / O for a log buffer
* @ bh : The buffer head
* @ uptodate : I / O Status
*
*/
static void gfs2_log_write_endio ( struct buffer_head * bh , int uptodate )
{
struct gfs2_sbd * sdp = bh - > b_private ;
bh - > b_private = NULL ;
end_buffer_write_sync ( bh , uptodate ) ;
if ( atomic_dec_and_test ( & sdp - > sd_log_in_flight ) )
wake_up ( & sdp - > sd_log_flush_wait ) ;
}
2006-01-16 19:50:04 +03:00
/**
* gfs2_log_get_buf - Get and initialize a buffer to use for log control data
* @ sdp : The GFS2 superblock
*
* Returns : the buffer_head
*/
struct buffer_head * gfs2_log_get_buf ( struct gfs2_sbd * sdp )
{
2006-09-04 20:49:07 +04:00
u64 blkno = log_bmap ( sdp , sdp - > sd_log_flush_head ) ;
2006-01-16 19:50:04 +03:00
struct buffer_head * bh ;
2007-09-17 13:59:52 +04:00
bh = sb_getblk ( sdp - > sd_vfs , blkno ) ;
2006-01-16 19:50:04 +03:00
lock_buffer ( bh ) ;
memset ( bh - > b_data , 0 , bh - > b_size ) ;
set_buffer_uptodate ( bh ) ;
clear_buffer_dirty ( bh ) ;
2007-09-17 13:59:52 +04:00
gfs2_log_incr_head ( sdp ) ;
atomic_inc ( & sdp - > sd_log_in_flight ) ;
bh - > b_private = sdp ;
bh - > b_end_io = gfs2_log_write_endio ;
2006-01-16 19:50:04 +03:00
return bh ;
}
2007-09-17 13:59:52 +04:00
/**
* gfs2_fake_write_endio -
* @ bh : The buffer head
* @ uptodate : The I / O Status
*
*/
static void gfs2_fake_write_endio ( struct buffer_head * bh , int uptodate )
{
struct buffer_head * real_bh = bh - > b_private ;
2007-09-26 12:39:31 +04:00
struct gfs2_bufdata * bd = real_bh - > b_private ;
struct gfs2_sbd * sdp = bd - > bd_gl - > gl_sbd ;
2007-09-17 13:59:52 +04:00
end_buffer_write_sync ( bh , uptodate ) ;
free_buffer_head ( bh ) ;
unlock_buffer ( real_bh ) ;
brelse ( real_bh ) ;
if ( atomic_dec_and_test ( & sdp - > sd_log_in_flight ) )
wake_up ( & sdp - > sd_log_flush_wait ) ;
}
2006-01-16 19:50:04 +03:00
/**
* gfs2_log_fake_buf - Build a fake buffer head to write metadata buffer to log
* @ sdp : the filesystem
* @ data : the data the buffer_head should point to
*
* Returns : the log buffer descriptor
*/
struct buffer_head * gfs2_log_fake_buf ( struct gfs2_sbd * sdp ,
struct buffer_head * real )
{
2006-09-04 20:49:07 +04:00
u64 blkno = log_bmap ( sdp , sdp - > sd_log_flush_head ) ;
2006-01-16 19:50:04 +03:00
struct buffer_head * bh ;
2007-09-17 13:59:52 +04:00
bh = alloc_buffer_head ( GFP_NOFS | __GFP_NOFAIL ) ;
2006-01-16 19:50:04 +03:00
atomic_set ( & bh - > b_count , 1 ) ;
2007-09-17 13:59:52 +04:00
bh - > b_state = ( 1 < < BH_Mapped ) | ( 1 < < BH_Uptodate ) | ( 1 < < BH_Lock ) ;
2006-02-08 14:50:51 +03:00
set_bh_page ( bh , real - > b_page , bh_offset ( real ) ) ;
2006-01-16 19:50:04 +03:00
bh - > b_blocknr = blkno ;
bh - > b_size = sdp - > sd_sb . sb_bsize ;
bh - > b_bdev = sdp - > sd_vfs - > s_bdev ;
2007-09-17 13:59:52 +04:00
bh - > b_private = real ;
bh - > b_end_io = gfs2_fake_write_endio ;
2006-01-16 19:50:04 +03:00
2007-09-17 13:59:52 +04:00
gfs2_log_incr_head ( sdp ) ;
atomic_inc ( & sdp - > sd_log_in_flight ) ;
2006-01-16 19:50:04 +03:00
return bh ;
}
[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 23:50:20 +04:00
static void log_pull_tail ( struct gfs2_sbd * sdp , unsigned int new_tail )
2006-01-16 19:50:04 +03:00
{
unsigned int dist = log_distance ( sdp , new_tail , sdp - > sd_log_tail ) ;
ail2_empty ( sdp , new_tail ) ;
gfs2_log_lock ( sdp ) ;
2007-11-08 17:55:03 +03:00
atomic_add ( dist , & sdp - > sd_log_blks_free ) ;
2009-06-12 11:49:20 +04:00
trace_gfs2_log_blocks ( sdp , dist ) ;
2007-11-08 17:55:03 +03:00
gfs2_assert_withdraw ( sdp , atomic_read ( & sdp - > sd_log_blks_free ) < = sdp - > sd_jdesc - > jd_blocks ) ;
2006-01-16 19:50:04 +03:00
gfs2_log_unlock ( sdp ) ;
sdp - > sd_log_tail = new_tail ;
}
/**
* log_write_header - Get and initialize a journal header buffer
* @ sdp : The GFS2 superblock
*
* Returns : the initialized log buffer descriptor
*/
2006-09-04 20:49:07 +04:00
static void log_write_header ( struct gfs2_sbd * sdp , u32 flags , int pull )
2006-01-16 19:50:04 +03:00
{
2006-09-04 20:49:07 +04:00
u64 blkno = log_bmap ( sdp , sdp - > sd_log_flush_head ) ;
2006-01-16 19:50:04 +03:00
struct buffer_head * bh ;
struct gfs2_log_header * lh ;
unsigned int tail ;
2006-09-04 20:49:07 +04:00
u32 hash ;
2006-01-16 19:50:04 +03:00
bh = sb_getblk ( sdp - > sd_vfs , blkno ) ;
lock_buffer ( bh ) ;
memset ( bh - > b_data , 0 , bh - > b_size ) ;
set_buffer_uptodate ( bh ) ;
clear_buffer_dirty ( bh ) ;
gfs2_ail1_empty ( sdp , 0 ) ;
tail = current_tail ( sdp ) ;
lh = ( struct gfs2_log_header * ) bh - > b_data ;
memset ( lh , 0 , sizeof ( struct gfs2_log_header ) ) ;
lh - > lh_header . mh_magic = cpu_to_be32 ( GFS2_MAGIC ) ;
2006-03-31 00:46:23 +04:00
lh - > lh_header . mh_type = cpu_to_be32 ( GFS2_METATYPE_LH ) ;
GFS2: Tag all metadata with jid
There are two spare field in the header common to all GFS2
metadata. One is just the right size to fit a journal id
in it, and this patch updates the journal code so that each
time a metadata block is modified, we tag it with the journal
id of the node which is performing the modification.
The reason for this is that it should make it much easier to
debug issues which arise if we can tell which node was the
last to modify a particular metadata block.
Since the field is updated before the block is written into
the journal, each journal should only contain metadata which
is tagged with its own journal id. The one exception to this
is the journal header block, which might have a different node's
id in it, if that journal was recovered by another node in the
cluster.
Thus each journal will contain a record of which nodes recovered
it, via the journal header.
The other field in the metadata header could potentially be
used to hold information about what kind of operation was
performed, but for the time being we just zero it on each
transaction so that if we use it for that in future, we'll
know that the information (where it exists) is reliable.
I did consider using the other field to hold the journal
sequence number, however since in GFS2's journaling we write
the modified data into the journal and not the original
data, this gives no information as to what action caused the
modification, so I think we can probably come up with a better
use for those 64 bits in the future.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2009-11-06 19:20:51 +03:00
lh - > lh_header . __pad0 = cpu_to_be64 ( 0 ) ;
2006-03-31 00:46:23 +04:00
lh - > lh_header . mh_format = cpu_to_be32 ( GFS2_FORMAT_LH ) ;
GFS2: Tag all metadata with jid
There are two spare field in the header common to all GFS2
metadata. One is just the right size to fit a journal id
in it, and this patch updates the journal code so that each
time a metadata block is modified, we tag it with the journal
id of the node which is performing the modification.
The reason for this is that it should make it much easier to
debug issues which arise if we can tell which node was the
last to modify a particular metadata block.
Since the field is updated before the block is written into
the journal, each journal should only contain metadata which
is tagged with its own journal id. The one exception to this
is the journal header block, which might have a different node's
id in it, if that journal was recovered by another node in the
cluster.
Thus each journal will contain a record of which nodes recovered
it, via the journal header.
The other field in the metadata header could potentially be
used to hold information about what kind of operation was
performed, but for the time being we just zero it on each
transaction so that if we use it for that in future, we'll
know that the information (where it exists) is reliable.
I did consider using the other field to hold the journal
sequence number, however since in GFS2's journaling we write
the modified data into the journal and not the original
data, this gives no information as to what action caused the
modification, so I think we can probably come up with a better
use for those 64 bits in the future.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2009-11-06 19:20:51 +03:00
lh - > lh_header . mh_jid = cpu_to_be32 ( sdp - > sd_jdesc - > jd_jid ) ;
2006-07-17 17:36:28 +04:00
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 ) ;
2006-01-16 19:50:04 +03:00
hash = gfs2_disk_hash ( bh - > b_data , sizeof ( struct gfs2_log_header ) ) ;
lh - > lh_hash = cpu_to_be32 ( hash ) ;
2008-09-26 13:23:22 +04:00
bh - > b_end_io = end_buffer_write_sync ;
if ( test_bit ( SDF_NOBARRIERS , & sdp - > sd_flags ) )
goto skip_barrier ;
get_bh ( bh ) ;
2009-04-07 17:13:01 +04:00
submit_bh ( WRITE_SYNC | ( 1 < < BIO_RW_BARRIER ) | ( 1 < < BIO_RW_META ) , bh ) ;
2008-09-26 13:23:22 +04:00
wait_on_buffer ( bh ) ;
if ( buffer_eopnotsupp ( bh ) ) {
clear_buffer_eopnotsupp ( bh ) ;
set_buffer_uptodate ( bh ) ;
set_bit ( SDF_NOBARRIERS , & sdp - > sd_flags ) ;
lock_buffer ( bh ) ;
skip_barrier :
get_bh ( bh ) ;
submit_bh ( WRITE_SYNC | ( 1 < < BIO_RW_META ) , bh ) ;
wait_on_buffer ( bh ) ;
}
if ( ! buffer_uptodate ( bh ) )
2006-01-16 19:50:04 +03:00
gfs2_io_error_bh ( sdp , bh ) ;
brelse ( bh ) ;
if ( sdp - > sd_log_tail ! = 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 23:50:20 +04:00
log_pull_tail ( sdp , tail ) ;
2006-01-16 19:50:04 +03:00
else
gfs2_assert_withdraw ( sdp , ! pull ) ;
sdp - > sd_log_idle = ( tail = = sdp - > sd_log_flush_head ) ;
2007-09-17 13:59:52 +04:00
gfs2_log_incr_head ( sdp ) ;
2006-01-16 19:50:04 +03:00
}
static void log_flush_commit ( struct gfs2_sbd * sdp )
{
2007-09-17 13:59:52 +04: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 19:50:04 +03:00
}
2007-09-17 13:59:52 +04:00
log_write_header ( sdp , 0 , 0 ) ;
2006-01-16 19:50:04 +03:00
}
2007-09-02 13:48:13 +04:00
static void gfs2_ordered_write ( struct gfs2_sbd * sdp )
{
struct gfs2_bufdata * bd ;
struct buffer_head * bh ;
LIST_HEAD ( written ) ;
gfs2_log_lock ( sdp ) ;
while ( ! list_empty ( & sdp - > sd_log_le_ordered ) ) {
bd = list_entry ( sdp - > sd_log_le_ordered . next , struct gfs2_bufdata , bd_le . le_list ) ;
list_move ( & bd - > bd_le . le_list , & written ) ;
bh = bd - > bd_bh ;
if ( ! buffer_dirty ( bh ) )
continue ;
get_bh ( bh ) ;
gfs2_log_unlock ( sdp ) ;
lock_buffer ( bh ) ;
2007-10-17 12:04:24 +04:00
if ( buffer_mapped ( bh ) & & test_clear_buffer_dirty ( bh ) ) {
2007-09-02 13:48:13 +04:00
bh - > b_end_io = end_buffer_write_sync ;
2009-04-07 17:13:01 +04:00
submit_bh ( WRITE_SYNC_PLUG , bh ) ;
2007-09-02 13:48:13 +04:00
} else {
unlock_buffer ( bh ) ;
brelse ( bh ) ;
}
gfs2_log_lock ( sdp ) ;
}
list_splice ( & written , & sdp - > sd_log_le_ordered ) ;
gfs2_log_unlock ( sdp ) ;
}
static void gfs2_ordered_wait ( struct gfs2_sbd * sdp )
{
struct gfs2_bufdata * bd ;
struct buffer_head * bh ;
gfs2_log_lock ( sdp ) ;
while ( ! list_empty ( & sdp - > sd_log_le_ordered ) ) {
bd = list_entry ( sdp - > sd_log_le_ordered . prev , struct gfs2_bufdata , bd_le . le_list ) ;
bh = bd - > bd_bh ;
if ( buffer_locked ( bh ) ) {
get_bh ( bh ) ;
gfs2_log_unlock ( sdp ) ;
wait_on_buffer ( bh ) ;
brelse ( bh ) ;
gfs2_log_lock ( sdp ) ;
continue ;
}
list_del_init ( & bd - > bd_le . le_list ) ;
}
gfs2_log_unlock ( sdp ) ;
}
2006-01-16 19:50:04 +03:00
/**
2006-04-07 19:17:32 +04:00
* gfs2_log_flush - flush incore transaction ( s )
2006-01-16 19:50:04 +03:00
* @ sdp : the filesystem
* @ gl : The glock structure to flush . If NULL , flush the whole incore log
*
*/
2007-11-08 17:25:12 +03:00
void __gfs2_log_flush ( struct gfs2_sbd * sdp , struct gfs2_glock * gl )
2006-01-16 19:50:04 +03:00
{
struct gfs2_ail * ai ;
2006-03-29 18:12:12 +04:00
down_write ( & sdp - > sd_log_flush_lock ) ;
2006-02-21 15:51:39 +03:00
2007-11-08 17:25:12 +03: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 15:51:39 +03:00
}
2009-06-12 11:49:20 +04:00
trace_gfs2_log_flush ( sdp , 1 ) ;
2006-02-21 15:51:39 +03:00
2006-04-07 19:17:32 +04:00
ai = kzalloc ( sizeof ( struct gfs2_ail ) , GFP_NOFS | __GFP_NOFAIL ) ;
INIT_LIST_HEAD ( & ai - > ai_ail1_list ) ;
INIT_LIST_HEAD ( & ai - > ai_ail2_list ) ;
2006-01-16 19:50:04 +03:00
2007-09-17 13:59:52 +04: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 19:50:04 +03: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 ;
ai - > ai_first = sdp - > sd_log_flush_head ;
2007-09-02 13:48:13 +04:00
gfs2_ordered_write ( sdp ) ;
2006-01-16 19:50:04 +03:00
lops_before_commit ( sdp ) ;
2007-09-02 13:48:13 +04:00
gfs2_ordered_wait ( sdp ) ;
2007-09-17 13:59:52 +04:00
if ( sdp - > sd_log_head ! = sdp - > sd_log_flush_head )
2006-01-16 19:50:04 +03:00
log_flush_commit ( sdp ) ;
[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 23:50:20 +04:00
else if ( sdp - > sd_log_tail ! = current_tail ( sdp ) & & ! sdp - > sd_log_idle ) {
gfs2_log_lock ( sdp ) ;
2007-11-08 17:55:03 +03:00
atomic_dec ( & sdp - > sd_log_blks_free ) ; /* Adjust for unreserved buffer */
2009-06-12 11:49:20 +04:00
trace_gfs2_log_blocks ( sdp , - 1 ) ;
[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 23:50:20 +04:00
gfs2_log_unlock ( sdp ) ;
2006-01-16 19:50:04 +03:00
log_write_header ( sdp , 0 , PULL ) ;
[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 23:50:20 +04:00
}
2006-01-16 19:50:04 +03:00
lops_after_commit ( sdp , ai ) ;
2006-04-07 19:17:32 +04:00
2006-10-11 21:34:59 +04:00
gfs2_log_lock ( sdp ) ;
sdp - > sd_log_head = sdp - > sd_log_flush_head ;
2006-09-13 19:13:27 +04: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 23:50:20 +04:00
sdp - > sd_log_commited_databuf = 0 ;
2006-09-13 19:13:27 +04:00
sdp - > sd_log_commited_revoke = 0 ;
2006-01-16 19:50:04 +03:00
if ( ! list_empty ( & ai - > ai_ail1_list ) ) {
list_add ( & ai - > ai_list , & sdp - > sd_ail1_list ) ;
ai = NULL ;
}
gfs2_log_unlock ( sdp ) ;
2009-06-12 11:49:20 +04:00
trace_gfs2_log_flush ( sdp , 0 ) ;
2006-03-29 18:12:12 +04:00
up_write ( & sdp - > sd_log_flush_lock ) ;
2006-01-16 19:50:04 +03:00
kfree ( ai ) ;
}
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 23:50:20 +04:00
unsigned int reserved ;
2008-01-10 17:49:43 +03:00
unsigned int unused ;
2006-01-16 19:50:04 +03: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 23:50:20 +04: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 19:50:04 +03: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 23:50:20 +04:00
reserved = calc_reserved ( sdp ) ;
2008-04-17 19:25:37 +04:00
gfs2_assert_withdraw ( sdp , sdp - > sd_log_blks_reserved + tr - > tr_reserved > = reserved ) ;
2008-01-10 17:49:43 +03:00
unused = sdp - > sd_log_blks_reserved - reserved + tr - > tr_reserved ;
atomic_add ( unused , & sdp - > sd_log_blks_free ) ;
2009-06-12 11:49:20 +04:00
trace_gfs2_log_blocks ( sdp , unused ) ;
2007-11-08 17:55:03 +03: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 23:50:20 +04:00
sdp - > sd_jdesc - > jd_blocks ) ;
2006-01-16 19:50:04 +03:00
sdp - > sd_log_blks_reserved = reserved ;
gfs2_log_unlock ( sdp ) ;
}
2008-01-28 20:20:10 +03:00
static void buf_lo_incore_commit ( struct gfs2_sbd * sdp , struct gfs2_trans * tr )
{
struct list_head * head = & tr - > tr_list_buf ;
struct gfs2_bufdata * bd ;
gfs2_log_lock ( sdp ) ;
while ( ! list_empty ( head ) ) {
bd = list_entry ( head - > next , struct gfs2_bufdata , bd_list_tr ) ;
list_del_init ( & bd - > bd_list_tr ) ;
tr - > tr_num_buf - - ;
}
gfs2_log_unlock ( sdp ) ;
gfs2_assert_warn ( sdp , ! tr - > tr_num_buf ) ;
}
2006-01-16 19:50:04 +03:00
/**
* gfs2_log_commit - Commit a transaction to the log
* @ sdp : the filesystem
* @ tr : the transaction
*
* Returns : errno
*/
void gfs2_log_commit ( struct gfs2_sbd * sdp , struct gfs2_trans * tr )
{
log_refund ( sdp , tr ) ;
2008-01-28 20:20:10 +03:00
buf_lo_incore_commit ( sdp , tr ) ;
2006-01-16 19:50:04 +03:00
2006-03-29 18:12:12 +04:00
up_read ( & sdp - > sd_log_flush_lock ) ;
2006-01-16 19:50:04 +03:00
gfs2_log_lock ( sdp ) ;
2006-11-23 18:51:34 +03:00
if ( sdp - > sd_log_num_buf > gfs2_tune_get ( sdp , gt_incore_log_blocks ) )
wake_up_process ( sdp - > sd_logd_process ) ;
gfs2_log_unlock ( sdp ) ;
2006-01-16 19:50:04 +03: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 18:12:12 +04:00
down_write ( & sdp - > sd_log_flush_lock ) ;
2006-01-16 19:50:04 +03: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 ;
[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 23:50:20 +04:00
log_write_header ( sdp , GFS2_LOG_HEAD_UNMOUNT ,
( sdp - > sd_log_tail = = current_tail ( sdp ) ) ? 0 : PULL ) ;
2006-01-16 19:50:04 +03:00
2007-11-08 17:55:03 +03:00
gfs2_assert_warn ( sdp , atomic_read ( & sdp - > sd_log_blks_free ) = = sdp - > sd_jdesc - > jd_blocks ) ;
2006-04-21 23:10:46 +04: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 19:50:04 +03:00
sdp - > sd_log_head = sdp - > sd_log_flush_head ;
sdp - > sd_log_tail = sdp - > sd_log_head ;
2006-03-29 18:12:12 +04:00
up_write ( & sdp - > sd_log_flush_lock ) ;
2006-01-16 19:50:04 +03:00
}
2006-11-23 19:06:35 +03: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_ail1_start ( sdp , DIO_ALL ) ;
if ( gfs2_ail1_empty ( sdp , DIO_ALL ) )
break ;
msleep ( 10 ) ;
}
}
2007-11-09 13:01:41 +03: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 ;
unsigned long t ;
int need_flush ;
while ( ! kthread_should_stop ( ) ) {
/* Advance the log tail */
t = sdp - > sd_log_flush_time +
gfs2_tune_get ( sdp , gt_log_flush_secs ) * HZ ;
gfs2_ail1_empty ( sdp , DIO_ALL ) ;
gfs2_log_lock ( sdp ) ;
need_flush = sdp - > sd_log_num_buf > gfs2_tune_get ( sdp , gt_incore_log_blocks ) ;
gfs2_log_unlock ( sdp ) ;
if ( need_flush | | time_after_eq ( jiffies , t ) ) {
gfs2_log_flush ( sdp , NULL ) ;
sdp - > sd_log_flush_time = jiffies ;
}
t = gfs2_tune_get ( sdp , gt_logd_secs ) * HZ ;
if ( freezing ( current ) )
refrigerator ( ) ;
schedule_timeout_interruptible ( t ) ;
}
return 0 ;
}