afs: Don't invalidate callback if AFS_VNODE_DIR_VALID not set

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: 25a4ff8b7623 ("afs: Fix directory handling")
Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index 1e630f016dc5bcf33646b09f90e1e9a713160a15..bf8f56e851dfe0f3775e66ee8fe616460e915050 100644 (file)
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -430,12 +430,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;