Commit 2fd90073 authored by David Howells's avatar David Howells Committed by Greg Kroah-Hartman

afs: Don't invalidate callback if AFS_VNODE_DIR_VALID not set

[ Upstream commit d9052dda ]

Don't invalidate the callback promise on a directory if the
AFS_VNODE_DIR_VALID flag is not set (which indicates that the directory
contents are invalid, due to edit failure, callback break, page reclaim).

The directory will be reloaded next time the directory is accessed, so
clearing the callback flag at this point may race with a reload of the
directory and cancel it's recorded callback promise.

Fixes: f3ddee8d ("afs: Fix directory handling")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f1e807d3
...@@ -398,12 +398,9 @@ int afs_validate(struct afs_vnode *vnode, struct key *key) ...@@ -398,12 +398,9 @@ int afs_validate(struct afs_vnode *vnode, struct key *key)
vnode->cb_s_break = vnode->cb_interest->server->cb_s_break; vnode->cb_s_break = vnode->cb_interest->server->cb_s_break;
vnode->cb_v_break = vnode->volume->cb_v_break; vnode->cb_v_break = vnode->volume->cb_v_break;
valid = false; valid = false;
} else if (vnode->status.type == AFS_FTYPE_DIR && } else if (test_bit(AFS_VNODE_ZAP_DATA, &vnode->flags)) {
(!test_bit(AFS_VNODE_DIR_VALID, &vnode->flags) ||
vnode->cb_expires_at - 10 <= now)) {
valid = false; valid = false;
} else if (test_bit(AFS_VNODE_ZAP_DATA, &vnode->flags) || } else if (vnode->cb_expires_at - 10 <= now) {
vnode->cb_expires_at - 10 <= now) {
valid = false; valid = false;
} else { } else {
valid = true; valid = true;
......
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