From patchwork Tue Nov 19 02:27:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Donnelly X-Patchwork-Id: 13879378 Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C25A713A24D for ; Tue, 19 Nov 2024 02:28:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731983291; cv=none; b=uQi6XrbYL1V033eQg+hFvT9PwkfvM2omSSv+d6+IsNxufdBLaU5afeZCb5Xd2f9BeET4I19Lx+r7wdALVC5saeNQVABYz836ks99Podk3cn87PNsiQPMua8ODGrpxNQqItCq01YmEaqWhiJRWnudpza8vvis4t//QRLne//5H5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731983291; c=relaxed/simple; bh=lFchxuWYdoChXXQRufyH2iiBvFGz6l9XBMUrcB9WM6s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p3g7zRbCFBIgw/fjhKCTlcFDowRmsBC24n6m1vvKTLHKi2BsZEx9IkfBXsvrGLAwXTGOSOjWJRsMBnbqcwQxfXz1dwFoytHsgjb5+RXAbHRvtSiuhh5MD1yQXpVMiyjbONzxriTu2pf44lO0nRiyff428p/GhqhUQVKTG/MsuaI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=batbytes.com; spf=none smtp.mailfrom=batbytes.com; dkim=pass (2048-bit key) header.d=batbytes-com.20230601.gappssmtp.com header.i=@batbytes-com.20230601.gappssmtp.com header.b=1i8Qj1aD; arc=none smtp.client-ip=209.85.222.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=batbytes.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=batbytes.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=batbytes-com.20230601.gappssmtp.com header.i=@batbytes-com.20230601.gappssmtp.com header.b="1i8Qj1aD" Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-7b35b1ca0c2so467411385a.0 for ; Mon, 18 Nov 2024 18:28:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=batbytes-com.20230601.gappssmtp.com; s=20230601; t=1731983288; x=1732588088; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qKaj8XArk4+aUuXdEGwzY4pbQVUlMNZ2d7arPW6y4hE=; b=1i8Qj1aDNF4uxJWABUlsRU+FF0C6L/RF1dPUlfAn7qIaGzW1QWQafGnWZAkCtMlbXg B+JiJ+azf9YEWyrVSjndIc8CVFgFuFuVMXxecjUSd/HpFLwtbtNGitbmdf8vYqJd6RXH CD2Kdt7Ss/oMqd8meI9zsYKLJpg5TUvFS38JY1A1YCmU2nnhnvKMOjH17Umf25B+NvqC Rh5VBnWxoEHtKcHqtkhp/VOR1I9JRZFBcBfjkrOTI8/KAOXGg5YP42ftmwrpX77EuqqT KiftiBlD3w8L3bKamDXtKo5GdLT3Pv0ZOgGB+Qj88pObGwH6Pug2zS+40RhwxVLAVv08 FKDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731983288; x=1732588088; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qKaj8XArk4+aUuXdEGwzY4pbQVUlMNZ2d7arPW6y4hE=; b=r4mMsVOjY/qVKDkw5pnyyuUmd8mbQsx7bQTJV/hcECjWIxz9ifs8XU52jyi3EDPVuu U8p/V//u7fIvBi7T2UUzreKnAoyDIjzDJh455QJsOCX+0fmJNVBT6n/rsyeZjpoGen9g 7k9cFBPCq7GQGEHtGreoDUpoCPhDyAHpWJ1gdnsym593VT+D/p6UNWqigSIDcLlEjn+x TDO2hD+URl6HBnXig3n7XZGsabepSddBVeLIpcxoErNrmkyo3+fzGEvo+EqbxcF917Vk 7nSDb4ZQaP/O5f5gBjNKeYsg606oBJPXh2Ni9/K7nQvouGY/5wXByns5Er5xpnOToSmw jlxA== X-Forwarded-Encrypted: i=1; AJvYcCXyd8EgJWkHyu0GUBdLzjiyrFUsLcnxQE4zlJviWpD/P8BkuqTvHFg32orq0wo+H6SpcVq269s9FIm4@vger.kernel.org X-Gm-Message-State: AOJu0YwiHWuoAVUixNugZiErHx65wM5MPaKkO5x2CUA365POTcIGTX/E CXXFAkMDqJ9hlHP0ao92eEcq1xoq/XJg8yTpvbBxDH1ykItKKvgnGLrBCyEi4A== X-Google-Smtp-Source: AGHT+IEg3a2lAF/vb390FhGCGjUrHn5uq6t+rXalinv1TCOWJl5FeBErqn5lQsxGjjhYGbT4Vi/OvA== X-Received: by 2002:a0c:f807:0:b0:6d4:1e3f:4367 with SMTP id 6a1803df08f44-6d42b8ff1d2mr25243446d6.16.1731983288645; Mon, 18 Nov 2024 18:28:08 -0800 (PST) Received: from batbytes.com ([216.212.123.7]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b37a8a9fdesm48293485a.124.2024.11.18.18.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2024 18:28:07 -0800 (PST) From: Patrick Donnelly To: Xiubo Li , Ilya Dryomov Cc: Patrick Donnelly , Patrick Donnelly , ceph-devel@vger.kernel.org (open list:CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 1/3] ceph: correct ceph_mds_cap_item field name Date: Mon, 18 Nov 2024 21:27:48 -0500 Message-ID: <20241119022752.1256662-2-batrick@batbytes.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241119022752.1256662-1-batrick@batbytes.com> References: <20241119022752.1256662-1-batrick@batbytes.com> Precedence: bulk X-Mailing-List: ceph-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The issue_seq is sent with bulk cap releases, not the current sequence number. See also ceph.git commit: "include/ceph_fs: correct ceph_mds_cap_item field name". See-also: https://tracker.ceph.com/issues/66704 Signed-off-by: Patrick Donnelly --- fs/ceph/mds_client.c | 2 +- include/linux/ceph/ceph_fs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index c4a5fd94bbbb..0be82de8a6da 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -2362,7 +2362,7 @@ static void ceph_send_cap_releases(struct ceph_mds_client *mdsc, item->ino = cpu_to_le64(cap->cap_ino); item->cap_id = cpu_to_le64(cap->cap_id); item->migrate_seq = cpu_to_le32(cap->mseq); - item->seq = cpu_to_le32(cap->issue_seq); + item->issue_seq = cpu_to_le32(cap->issue_seq); msg->front.iov_len += sizeof(*item); ceph_put_cap(mdsc, cap); diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h index ee1d0e5f9789..4ff3ad5e9210 100644 --- a/include/linux/ceph/ceph_fs.h +++ b/include/linux/ceph/ceph_fs.h @@ -822,7 +822,7 @@ struct ceph_mds_cap_release { struct ceph_mds_cap_item { __le64 ino; __le64 cap_id; - __le32 migrate_seq, seq; + __le32 migrate_seq, issue_seq; } __attribute__ ((packed)); #define CEPH_MDS_LEASE_REVOKE 1 /* mds -> client */