afs: Print the operation debug_id when logging an unexpected data version

Print the afs_operation debug_id when logging an unexpected change in the
data version.  This allows the logged message to be matched against
tracelines.

Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index 48edd8d724d2664f8335c987d1e25d153cbff968..0bc7273100b86e448c4954c25a09995b630a81f6 100644 (file)
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -215,11 +215,12 @@ static void afs_apply_status(struct afs_operation *op,
 
        if (vp->dv_before + vp->dv_delta != status->data_version) {
                if (test_bit(AFS_VNODE_CB_PROMISED, &vnode->flags))
-                       pr_warn("kAFS: vnode modified {%llx:%llu} %llx->%llx %s\n",
+                       pr_warn("kAFS: vnode modified {%llx:%llu} %llx->%llx %s (op=%x)\n",
                                vnode->fid.vid, vnode->fid.vnode,
                                (unsigned long long)vp->dv_before + vp->dv_delta,
                                (unsigned long long)status->data_version,
-                               op->type ? op->type->name : "???");
+                               op->type ? op->type->name : "???",
+                               op->debug_id);
 
                vnode->invalid_before = status->data_version;
                if (vnode->status.type == AFS_FTYPE_DIR) {