diff options
author | Andreas Gruenbacher <agruenba@redhat.com> | 2022-06-10 11:42:33 +0200 |
---|---|---|
committer | Andreas Gruenbacher <agruenba@redhat.com> | 2022-06-29 16:56:41 +0200 |
commit | 86c30a01f5da411d0d090f14f7aeadd8c20b2d05 (patch) | |
tree | ee9f254abe2fe9f60da91ecd4607b6550e430100 /fs/gfs2/glops.c | |
parent | de3f906f0af0c3f5d862b07df4d020c9322cd9c3 (diff) |
gfs2: Add new go_held glock operation
Right now, inode_go_instantiate() contains functionality that relates to
how a glock is held rather than the glock itself, like waiting for
pending direct I/O to complete and completing interrupted truncates.
This code is meant to be run each time a holder is acquired, but
go_instantiate is actually only called once, when the glock is
instantiated.
To fix that, introduce a new go_held glock operation that is called each
time a glock holder is acquired. Move the holder specific code in
inode_go_instantiate() over to inode_go_held().
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/gfs2/glops.c')
-rw-r--r-- | fs/gfs2/glops.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index c387f80ca65e..4e0a9909087c 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c @@ -489,14 +489,21 @@ static int inode_go_instantiate(struct gfs2_holder *gh) { struct gfs2_glock *gl = gh->gh_gl; struct gfs2_inode *ip = gl->gl_object; - int error = 0; if (!ip) /* no inode to populate - read it in later */ - goto out; + return 0; - error = gfs2_inode_refresh(ip); - if (error) - goto out; + return gfs2_inode_refresh(ip); +} + +static int inode_go_held(struct gfs2_holder *gh) +{ + struct gfs2_glock *gl = gh->gh_gl; + struct gfs2_inode *ip = gl->gl_object; + int error = 0; + + if (!ip) /* no inode to populate - read it in later */ + return 0; if (gh->gh_state != LM_ST_DEFERRED) inode_dio_wait(&ip->i_inode); @@ -506,7 +513,6 @@ static int inode_go_instantiate(struct gfs2_holder *gh) (gh->gh_state == LM_ST_EXCLUSIVE)) error = gfs2_truncatei_resume(ip); -out: return error; } @@ -730,6 +736,7 @@ const struct gfs2_glock_operations gfs2_inode_glops = { .go_inval = inode_go_inval, .go_demote_ok = inode_go_demote_ok, .go_instantiate = inode_go_instantiate, + .go_held = inode_go_held, .go_dump = inode_go_dump, .go_type = LM_TYPE_INODE, .go_flags = GLOF_ASPACE | GLOF_LRU | GLOF_LVB, |