Commit 6bac243f authored by Steven Whitehouse's avatar Steven Whitehouse Committed by Steven Whitehouse

GFS2: Clean up of glops.c

This cleans up a number of bits of code mostly based in glops.c.
A couple of simple functions have been merged into the callers
to make it more obvious what is going on, the mysterious raising
of i_writecount around the truncate_inode_pages() call has been
removed. The meta_go_* operations have been renamed rgrp_go_*
since that is the only lock type that they are used with.

The unused argument of gfs2_read_sb has been removed. Also
a bug has been fixed where a check for the rindex inode was
in the wrong callback. More comments are added, and the
debugging code is improved too.
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 02ffad08
...@@ -76,29 +76,7 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl) ...@@ -76,29 +76,7 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl)
} }
/** /**
* gfs2_pte_inval - Sync and invalidate all PTEs associated with a glock * rgrp_go_sync - sync out the metadata for this glock
* @gl: the glock
*
*/
static void gfs2_pte_inval(struct gfs2_glock *gl)
{
struct gfs2_inode *ip;
struct inode *inode;
ip = gl->gl_object;
inode = &ip->i_inode;
if (!ip || !S_ISREG(inode->i_mode))
return;
unmap_shared_mapping_range(inode->i_mapping, 0, 0);
if (test_bit(GIF_SW_PAGED, &ip->i_flags))
set_bit(GLF_DIRTY, &gl->gl_flags);
}
/**
* meta_go_sync - sync out the metadata for this glock
* @gl: the glock * @gl: the glock
* *
* Called when demoting or unlocking an EX glock. We must flush * Called when demoting or unlocking an EX glock. We must flush
...@@ -106,36 +84,42 @@ static void gfs2_pte_inval(struct gfs2_glock *gl) ...@@ -106,36 +84,42 @@ static void gfs2_pte_inval(struct gfs2_glock *gl)
* not return to caller to demote/unlock the glock until I/O is complete. * not return to caller to demote/unlock the glock until I/O is complete.
*/ */
static void meta_go_sync(struct gfs2_glock *gl) static void rgrp_go_sync(struct gfs2_glock *gl)
{ {
if (gl->gl_state != LM_ST_EXCLUSIVE) struct address_space *metamapping = gl->gl_aspace->i_mapping;
int error;
if (!test_and_clear_bit(GLF_DIRTY, &gl->gl_flags))
return; return;
BUG_ON(gl->gl_state != LM_ST_EXCLUSIVE);
if (test_and_clear_bit(GLF_DIRTY, &gl->gl_flags)) {
gfs2_log_flush(gl->gl_sbd, gl); gfs2_log_flush(gl->gl_sbd, gl);
gfs2_meta_sync(gl); filemap_fdatawrite(metamapping);
error = filemap_fdatawait(metamapping);
mapping_set_error(metamapping, error);
gfs2_ail_empty_gl(gl); gfs2_ail_empty_gl(gl);
}
} }
/** /**
* meta_go_inval - invalidate the metadata for this glock * rgrp_go_inval - invalidate the metadata for this glock
* @gl: the glock * @gl: the glock
* @flags: * @flags:
* *
* We never used LM_ST_DEFERRED with resource groups, so that we
* should always see the metadata flag set here.
*
*/ */
static void meta_go_inval(struct gfs2_glock *gl, int flags) static void rgrp_go_inval(struct gfs2_glock *gl, int flags)
{ {
if (!(flags & DIO_METADATA)) struct address_space *mapping = gl->gl_aspace->i_mapping;
return;
gfs2_meta_inval(gl); BUG_ON(!(flags & DIO_METADATA));
if (gl->gl_object == GFS2_I(gl->gl_sbd->sd_rindex)) gfs2_assert_withdraw(gl->gl_sbd, !atomic_read(&gl->gl_ail_count));
gl->gl_sbd->sd_rindex_uptodate = 0; truncate_inode_pages(mapping, 0);
else if (gl->gl_ops == &gfs2_rgrp_glops && gl->gl_object) {
struct gfs2_rgrpd *rgd = (struct gfs2_rgrpd *)gl->gl_object;
if (gl->gl_object) {
struct gfs2_rgrpd *rgd = (struct gfs2_rgrpd *)gl->gl_object;
rgd->rd_flags &= ~GFS2_RDF_UPTODATE; rgd->rd_flags &= ~GFS2_RDF_UPTODATE;
} }
} }
...@@ -152,15 +136,15 @@ static void inode_go_sync(struct gfs2_glock *gl) ...@@ -152,15 +136,15 @@ static void inode_go_sync(struct gfs2_glock *gl)
struct address_space *metamapping = gl->gl_aspace->i_mapping; struct address_space *metamapping = gl->gl_aspace->i_mapping;
int error; int error;
if (gl->gl_state != LM_ST_UNLOCKED)
gfs2_pte_inval(gl);
if (gl->gl_state != LM_ST_EXCLUSIVE)
return;
if (ip && !S_ISREG(ip->i_inode.i_mode)) if (ip && !S_ISREG(ip->i_inode.i_mode))
ip = NULL; ip = NULL;
if (ip && test_and_clear_bit(GIF_SW_PAGED, &ip->i_flags))
unmap_shared_mapping_range(ip->i_inode.i_mapping, 0, 0);
if (!test_and_clear_bit(GLF_DIRTY, &gl->gl_flags))
return;
BUG_ON(gl->gl_state != LM_ST_EXCLUSIVE);
if (test_bit(GLF_DIRTY, &gl->gl_flags)) {
gfs2_log_flush(gl->gl_sbd, gl); gfs2_log_flush(gl->gl_sbd, gl);
filemap_fdatawrite(metamapping); filemap_fdatawrite(metamapping);
if (ip) { if (ip) {
...@@ -171,9 +155,7 @@ static void inode_go_sync(struct gfs2_glock *gl) ...@@ -171,9 +155,7 @@ static void inode_go_sync(struct gfs2_glock *gl)
} }
error = filemap_fdatawait(metamapping); error = filemap_fdatawait(metamapping);
mapping_set_error(metamapping, error); mapping_set_error(metamapping, error);
clear_bit(GLF_DIRTY, &gl->gl_flags);
gfs2_ail_empty_gl(gl); gfs2_ail_empty_gl(gl);
}
} }
/** /**
...@@ -181,19 +163,27 @@ static void inode_go_sync(struct gfs2_glock *gl) ...@@ -181,19 +163,27 @@ static void inode_go_sync(struct gfs2_glock *gl)
* @gl: the glock * @gl: the glock
* @flags: * @flags:
* *
* Normally we invlidate everything, but if we are moving into
* LM_ST_DEFERRED from LM_ST_SHARED or LM_ST_EXCLUSIVE then we
* can keep hold of the metadata, since it won't have changed.
*
*/ */
static void inode_go_inval(struct gfs2_glock *gl, int flags) static void inode_go_inval(struct gfs2_glock *gl, int flags)
{ {
struct gfs2_inode *ip = gl->gl_object; struct gfs2_inode *ip = gl->gl_object;
int meta = (flags & DIO_METADATA);
if (meta) { gfs2_assert_withdraw(gl->gl_sbd, !atomic_read(&gl->gl_ail_count));
gfs2_meta_inval(gl);
if (flags & DIO_METADATA) {
struct address_space *mapping = gl->gl_aspace->i_mapping;
truncate_inode_pages(mapping, 0);
if (ip) if (ip)
set_bit(GIF_INVALID, &ip->i_flags); set_bit(GIF_INVALID, &ip->i_flags);
} }
if (ip == GFS2_I(gl->gl_sbd->sd_rindex))
gl->gl_sbd->sd_rindex_uptodate = 0;
if (ip && S_ISREG(ip->i_inode.i_mode)) if (ip && S_ISREG(ip->i_inode.i_mode))
truncate_inode_pages(ip->i_inode.i_mapping, 0); truncate_inode_pages(ip->i_inode.i_mapping, 0);
} }
...@@ -395,7 +385,6 @@ static int trans_go_demote_ok(const struct gfs2_glock *gl) ...@@ -395,7 +385,6 @@ static int trans_go_demote_ok(const struct gfs2_glock *gl)
} }
const struct gfs2_glock_operations gfs2_meta_glops = { const struct gfs2_glock_operations gfs2_meta_glops = {
.go_xmote_th = meta_go_sync,
.go_type = LM_TYPE_META, .go_type = LM_TYPE_META,
}; };
...@@ -410,8 +399,8 @@ const struct gfs2_glock_operations gfs2_inode_glops = { ...@@ -410,8 +399,8 @@ const struct gfs2_glock_operations gfs2_inode_glops = {
}; };
const struct gfs2_glock_operations gfs2_rgrp_glops = { const struct gfs2_glock_operations gfs2_rgrp_glops = {
.go_xmote_th = meta_go_sync, .go_xmote_th = rgrp_go_sync,
.go_inval = meta_go_inval, .go_inval = rgrp_go_inval,
.go_demote_ok = rgrp_go_demote_ok, .go_demote_ok = rgrp_go_demote_ok,
.go_lock = rgrp_go_lock, .go_lock = rgrp_go_lock,
.go_unlock = rgrp_go_unlock, .go_unlock = rgrp_go_unlock,
......
...@@ -88,27 +88,6 @@ void gfs2_aspace_put(struct inode *aspace) ...@@ -88,27 +88,6 @@ void gfs2_aspace_put(struct inode *aspace)
iput(aspace); iput(aspace);
} }
/**
* gfs2_meta_inval - Invalidate all buffers associated with a glock
* @gl: the glock
*
*/
void gfs2_meta_inval(struct gfs2_glock *gl)
{
struct gfs2_sbd *sdp = gl->gl_sbd;
struct inode *aspace = gl->gl_aspace;
struct address_space *mapping = gl->gl_aspace->i_mapping;
gfs2_assert_withdraw(sdp, !atomic_read(&gl->gl_ail_count));
atomic_inc(&aspace->i_writecount);
truncate_inode_pages(mapping, 0);
atomic_dec(&aspace->i_writecount);
gfs2_assert_withdraw(sdp, !mapping->nrpages);
}
/** /**
* gfs2_meta_sync - Sync all buffers associated with a glock * gfs2_meta_sync - Sync all buffers associated with a glock
* @gl: The glock * @gl: The glock
......
...@@ -40,7 +40,6 @@ static inline void gfs2_buffer_copy_tail(struct buffer_head *to_bh, ...@@ -40,7 +40,6 @@ static inline void gfs2_buffer_copy_tail(struct buffer_head *to_bh,
struct inode *gfs2_aspace_get(struct gfs2_sbd *sdp); struct inode *gfs2_aspace_get(struct gfs2_sbd *sdp);
void gfs2_aspace_put(struct inode *aspace); void gfs2_aspace_put(struct inode *aspace);
void gfs2_meta_inval(struct gfs2_glock *gl);
void gfs2_meta_sync(struct gfs2_glock *gl); void gfs2_meta_sync(struct gfs2_glock *gl);
struct buffer_head *gfs2_meta_new(struct gfs2_glock *gl, u64 blkno); struct buffer_head *gfs2_meta_new(struct gfs2_glock *gl, u64 blkno);
......
...@@ -355,7 +355,6 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct page *page) ...@@ -355,7 +355,6 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct page *page)
if (ret) if (ret)
goto out; goto out;
set_bit(GIF_SW_PAGED, &ip->i_flags);
ret = gfs2_write_alloc_required(ip, pos, PAGE_CACHE_SIZE, &alloc_required); ret = gfs2_write_alloc_required(ip, pos, PAGE_CACHE_SIZE, &alloc_required);
if (ret || !alloc_required) if (ret || !alloc_required)
goto out_unlock; goto out_unlock;
...@@ -396,6 +395,8 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct page *page) ...@@ -396,6 +395,8 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct page *page)
goto out_unlock_page; goto out_unlock_page;
} }
ret = gfs2_allocate_page_backing(page); ret = gfs2_allocate_page_backing(page);
if (!ret)
set_bit(GIF_SW_PAGED, &ip->i_flags);
out_unlock_page: out_unlock_page:
unlock_page(page); unlock_page(page);
......
...@@ -296,15 +296,15 @@ static int gfs2_read_super(struct gfs2_sbd *sdp, sector_t sector) ...@@ -296,15 +296,15 @@ static int gfs2_read_super(struct gfs2_sbd *sdp, sector_t sector)
__free_page(page); __free_page(page);
return 0; return 0;
} }
/** /**
* gfs2_read_sb - Read super block * gfs2_read_sb - Read super block
* @sdp: The GFS2 superblock * @sdp: The GFS2 superblock
* @gl: the glock for the superblock (assumed to be held)
* @silent: Don't print message if mount fails * @silent: Don't print message if mount fails
* *
*/ */
static int gfs2_read_sb(struct gfs2_sbd *sdp, struct gfs2_glock *gl, int silent) static int gfs2_read_sb(struct gfs2_sbd *sdp, int silent)
{ {
u32 hash_blocks, ind_blocks, leaf_blocks; u32 hash_blocks, ind_blocks, leaf_blocks;
u32 tmp_blocks; u32 tmp_blocks;
...@@ -524,7 +524,7 @@ static int init_sb(struct gfs2_sbd *sdp, int silent) ...@@ -524,7 +524,7 @@ static int init_sb(struct gfs2_sbd *sdp, int silent)
return ret; return ret;
} }
ret = gfs2_read_sb(sdp, sb_gh.gh_gl, silent); ret = gfs2_read_sb(sdp, silent);
if (ret) { if (ret) {
fs_err(sdp, "can't read superblock: %d\n", ret); fs_err(sdp, "can't read superblock: %d\n", ret);
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment