afs: Fix the fallback handling for the YFS.RemoveFile2 RPC call

[ Upstream commit e30458d690f35abb01de8b3cbc09285deb725d00 ]

Fix a pair of bugs in the fallback handling for the YFS.RemoveFile2 RPC
call:

 (1) Fix the abort code check to also look for RXGEN_OPCODE.  The lack of
     this masks the second bug.

 (2) call->server is now not used for ordinary filesystem RPC calls that
     have an operation descriptor.  Fix to use call->op->server instead.

Fixes: e49c7b2f6de7 ("afs: Build an abstraction around an "operation" concept")
Signed-off-by: David Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/109541.1736865963@warthog.procyon.org.uk
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/afs/yfsclient.c b/fs/afs/yfsclient.c
index 88ea20e79ae270ae75c4bf184a9b5041a48fe25a..b3bc46a112242a92232eef4c39e4d53546b3600b 100644 (file)
--- a/fs/afs/yfsclient.c
+++ b/fs/afs/yfsclient.c
@@ -662,8 +662,9 @@ static int yfs_deliver_fs_remove_file2(struct afs_call *call)
 static void yfs_done_fs_remove_file2(struct afs_call *call)
 {
        if (call->error == -ECONNABORTED &&
-           call->abort_code == RX_INVALID_OPERATION) {
-               set_bit(AFS_SERVER_FL_NO_RM2, &call->server->flags);
+           (call->abort_code == RX_INVALID_OPERATION ||
+            call->abort_code == RXGEN_OPCODE)) {
+               set_bit(AFS_SERVER_FL_NO_RM2, &call->op->server->flags);
                call->op->flags |= AFS_OPERATION_DOWNGRADE;
        }
 }