afs: Don't invalidate callback if AFS_VNODE_DIR_VALID not set
[ Upstream commit d9052dda8a39069312218f913d22d99c48d90004 ]
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: f3ddee8dc4
("afs: Fix directory handling")
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
f1e807d392
commit
2fd90073c8
1 changed files with 2 additions and 5 deletions
|
@ -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_v_break = vnode->volume->cb_v_break;
|
||||
valid = false;
|
||||
} else if (vnode->status.type == AFS_FTYPE_DIR &&
|
||||
(!test_bit(AFS_VNODE_DIR_VALID, &vnode->flags) ||
|
||||
vnode->cb_expires_at - 10 <= now)) {
|
||||
} else if (test_bit(AFS_VNODE_ZAP_DATA, &vnode->flags)) {
|
||||
valid = false;
|
||||
} else if (test_bit(AFS_VNODE_ZAP_DATA, &vnode->flags) ||
|
||||
vnode->cb_expires_at - 10 <= now) {
|
||||
} else if (vnode->cb_expires_at - 10 <= now) {
|
||||
valid = false;
|
||||
} else {
|
||||
valid = true;
|
||||
|
|
Loading…
Reference in a new issue