GFS2: Wait for async DIO in glock state changes
We need to wait for any outstanding DIO to complete in a couple of situations. Firstly, in case we are changing out of deferred mode (in inode_go_sync) where GLF_DIRTY will not be set. That call could be prefixed with a test for gl_state == LM_ST_DEFERRED but it doesn't seem worth it bearing in mind that the test for outstanding DIO is very quick anyway, in the usual case that there is none. The second case is in inode_go_lock which will catch the cases where we have a cached EX lock, but where we grant deferred locks against it so that there is no glock state transistion. We only need to wait if the state is not deferred, since DIO is valid anyway in that state. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
parent
dfd11184d8
commit
582d2f7aed
|
@ -192,8 +192,11 @@ static void inode_go_sync(struct gfs2_glock *gl)
|
||||||
|
|
||||||
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))
|
if (ip) {
|
||||||
|
if (test_and_clear_bit(GIF_SW_PAGED, &ip->i_flags))
|
||||||
unmap_shared_mapping_range(ip->i_inode.i_mapping, 0, 0);
|
unmap_shared_mapping_range(ip->i_inode.i_mapping, 0, 0);
|
||||||
|
inode_dio_wait(&ip->i_inode);
|
||||||
|
}
|
||||||
if (!test_and_clear_bit(GLF_DIRTY, &gl->gl_flags))
|
if (!test_and_clear_bit(GLF_DIRTY, &gl->gl_flags))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -410,6 +413,9 @@ static int inode_go_lock(struct gfs2_holder *gh)
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (gh->gh_state != LM_ST_DEFERRED)
|
||||||
|
inode_dio_wait(&ip->i_inode);
|
||||||
|
|
||||||
if ((ip->i_diskflags & GFS2_DIF_TRUNC_IN_PROG) &&
|
if ((ip->i_diskflags & GFS2_DIF_TRUNC_IN_PROG) &&
|
||||||
(gl->gl_state == LM_ST_EXCLUSIVE) &&
|
(gl->gl_state == LM_ST_EXCLUSIVE) &&
|
||||||
(gh->gh_state == LM_ST_EXCLUSIVE)) {
|
(gh->gh_state == LM_ST_EXCLUSIVE)) {
|
||||||
|
|
Loading…
Reference in a new issue