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/glock.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/glock.c')
| -rw-r--r-- | fs/gfs2/glock.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 347c7bc1fae3..6fe088644d7d 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -488,7 +488,7 @@ int gfs2_instantiate(struct gfs2_holder *gh) again: if (!test_bit(GLF_INSTANTIATE_NEEDED, &gl->gl_flags)) - return 0; + goto done; /* * Since we unlock the lockref lock, we set a flag to indicate @@ -511,7 +511,13 @@ again: if (!ret) clear_bit(GLF_INSTANTIATE_NEEDED, &gl->gl_flags); clear_and_wake_up_bit(GLF_INSTANTIATE_IN_PROG, &gl->gl_flags); - return ret; + if (ret) + return ret; + +done: + if (glops->go_held) + return glops->go_held(gh); + return 0; } /** |