From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F3433FB074 for ; Wed, 29 Apr 2026 12:52:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777467145; cv=none; b=HcSLZQGU1RmW7UNSu1clvJMtnX1N+Z1gmsXX7Lyb/7Si8LWGinUCCjgP+GoDsUajc9c9UBH1gt5/91rGvbOhMjHllMZ3CEMiLau4WE5jRSxsvKEw6qpkVQWRK5CQhWJb+qfD3syna40k64pGpIiWSNPctcSUtL+kXkXZ8gYLaBs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777467145; c=relaxed/simple; bh=n6py2gDKtkRa4hq2U3u/EpuJJ52f5YtnTxhElAFdc98=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=t8q6kwhyBrEOwlbF+I8/raBykkDmQ1QHcSOY02r4K3s+vX+rOCMKSmmAsPoYtn616WD4gPLzIGf9IbKGCEewastlZCSKGdpvxTzzwGg9jxj5gMqu5P95OmiABLgvnvoXU/xCCaNNT1aS5ZCAsBFHsvgc2hu3En67hzVp11CcT5I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=bHfjrTBm; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=DAZ1JPfe; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bHfjrTBm"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="DAZ1JPfe" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777467141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QaBh0LY8b0LH2S35QVWwlSLJbEkN44+12f5qWMSzHpY=; b=bHfjrTBmBtiB8lKT/QdTOrOwf0Iyv4BwwyfmTb7X6ForWe70rJMsVXUzgk2ZmKw4HE2B3G YqZ/WxttfQvciydKLvIxl2at6YV1C9PRpAwR+7zRtWCSQFZpY62MBGweNXfxRkyvyy5bTq xsnMBJ4EI712TJYCe/pzF33OumVwaGc= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-610-KK0K9yVXPN2DQ-nZT_CpWw-1; Wed, 29 Apr 2026 08:52:19 -0400 X-MC-Unique: KK0K9yVXPN2DQ-nZT_CpWw-1 X-Mimecast-MFC-AGG-ID: KK0K9yVXPN2DQ-nZT_CpWw_1777467139 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-66c165a7a8cso11538189a12.1 for ; Wed, 29 Apr 2026 05:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1777467138; x=1778071938; 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=QaBh0LY8b0LH2S35QVWwlSLJbEkN44+12f5qWMSzHpY=; b=DAZ1JPfeKN7hbn9z3FLpbJQ2c6G3lpPeejT817AC0lBkjVHncOi1yf1BFLiHcH1cE7 9QbRkY7rJauYegwdysm60dm52zuPy64q+IRZv5TlBWjtj8fCSPn51S1Anz78oWr3YO8x 6elOKcbUMPd50xw47L5WwPC0day/kNgiPDnmiCz7qQHQi9dyRO/4C44dqEWdIYmQkeEB XpZKe7p2+yZFMlHf8poKjIEPafY068s43mBuCtSOUwkA/2/+r82J2+OpkoVOoQceBBb/ OToQv11kXs/SyZ81gOMPqVD6VAkoNnfWju1Y/tBqncZ41v6FXfjyFMN95ylhklCD6sSH wrkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777467138; x=1778071938; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QaBh0LY8b0LH2S35QVWwlSLJbEkN44+12f5qWMSzHpY=; b=pRh8KZS9wURU7ws6fQ7++t9UMaKrHbM2FZTOBj98JFZtgVHCpx+0TPAQW/t43sM42P AVcgCH+kiNXvpQ1nlVQQr/N+oHd/W1BJlq/VNbXMVtX+G86OM9RBSz+iz5NoBhVNbSh6 DOJUWaSCzk/3FPBEDyMuE6RWhTCPev6ux0yICf9hAyMusBMPKfIvGltPVBW3/t+GZ6fz PCTyIJu6Ro12UxjLzsX5UBZp7GyUG0t6NBz9q2Oc8xsIgEOlazZP404kSp4qgBvqgoPv u5SHQmwmgmuFqCQERqNQmeGR/3NMZSuQkSBx6iYdBOwa+O9bAbdnyN0/l8QoYAJ4ufFQ sEkQ== X-Gm-Message-State: AOJu0YwbSDeB7/1rmZSQqCGFLNcQR16oA6C7RUNf9bhrINrwZLYou4V7 Ks13Hqli+IY5sQMaycBOokx8yX9HMFCrQ1e8iS4h283OTaqzG9hgqRM0J00KJSEmJKK94CljIGO a0Pv6XhaBrf3zl3WY+vDspeTAp1sGWDB5WG7h9dREuDgYjD9253ktlzV3DZxBhWxE/++W9THicM 7C X-Gm-Gg: AeBDietwnUTHkeOLFH3+0+SC1rHHkDj4Ja2+Lh9t/1tkY9NW+7ZxkSkfwxj2pe7sA/k 63c1nLPHF/xWAaCSC1S6m+PiD5mdzb7RDV+K5XL1ay9Kp+Bl46OnSInzWVc2G56N9Op43shwY2m xaLWZNqiIPtZPwgw8Vnhjd2iMOucaKgPy6/11kkc4nT7/Pkrc1VWB7PA/crOXGR6Po07vwsZ4NB rBnhXsoh+wgpgXwDipV4fJvTEj6dlbxal0e9lQB6/narrKv8zZTFrX6oa3NkRLPDIrAYfxLYuvZ jfQBrEwwi4z6RE1HEDGqD6JJDvP1RaWuoFUo5vsh6hkjqFpNHa8iGXLYTlNCcf7Bvq3NbWA/x6x Js7MCgcZwXpEAvEvPdJx4kf1Knwv1aNAcpqhyICc1HIoIk4xkHPz7hNqQJBD0InnA/g== X-Received: by 2002:a05:6402:538a:b0:674:40c3:f047 with SMTP id 4fb4d7f45d1cf-679bb05e13emr3933434a12.12.1777467138319; Wed, 29 Apr 2026 05:52:18 -0700 (PDT) X-Received: by 2002:a05:6402:538a:b0:674:40c3:f047 with SMTP id 4fb4d7f45d1cf-679bb05e13emr3933407a12.12.1777467137799; Wed, 29 Apr 2026 05:52:17 -0700 (PDT) Received: from cluster.. (4f.55.790d.ip4.static.sl-reverse.com. [13.121.85.79]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-67b22166a6esm680526a12.25.2026.04.29.05.52.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2026 05:52:16 -0700 (PDT) From: Alex Markuze To: ceph-devel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, idryomov@gmail.com, vdubeyko@redhat.com, Alex Markuze , Viacheslav Dubeyko Subject: [PATCH v3 02/11] ceph: use proper endian conversion for flock_len in reconnect Date: Wed, 29 Apr 2026 12:51:57 +0000 Message-Id: <20260429125206.1512203-3-amarkuze@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260429125206.1512203-1-amarkuze@redhat.com> References: <20260429125206.1512203-1-amarkuze@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace the __force __le32 cast with cpu_to_le32() for the flock_len field in reconnect_caps_cb(). The old code used a type-system bypass to silence sparse; the new form uses the proper endian conversion macro. Also switch from a raw bitmask test against i_ceph_flags to test_bit() on the named CEPH_I_ERROR_FILELOCK_BIT, which is the correct accessor for the unsigned long flags field after the bit-position conversion. Remove the now-unused CEPH_I_ERROR_FILELOCK mask define since all callers use the _BIT form with test_bit/set_bit/clear_bit. Reviewed-by: Viacheslav Dubeyko Signed-off-by: Alex Markuze --- fs/ceph/mds_client.c | 5 +++-- fs/ceph/super.h | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index ccf0d53dde2b..871f0eef468d 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -4693,8 +4693,9 @@ static int reconnect_caps_cb(struct inode *inode, int mds, void *arg) rec.v2.issued = cpu_to_le32(cap->issued); rec.v2.snaprealm = cpu_to_le64(ci->i_snap_realm->ino); rec.v2.pathbase = cpu_to_le64(path_info.vino.ino); - rec.v2.flock_len = (__force __le32) - ((ci->i_ceph_flags & CEPH_I_ERROR_FILELOCK) ? 0 : 1); + rec.v2.flock_len = cpu_to_le32( + test_bit(CEPH_I_ERROR_FILELOCK_BIT, + &ci->i_ceph_flags) ? 0 : 1); } else { struct timespec64 ts; diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 66b047606d65..30911ccf961e 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -681,7 +681,6 @@ static inline struct inode *ceph_find_inode(struct super_block *sb, #define CEPH_I_FLUSH_SNAPS (1 << CEPH_I_FLUSH_SNAPS_BIT) #define CEPH_I_ODIRECT (1 << CEPH_I_ODIRECT_BIT) #define CEPH_I_ASYNC_CREATE (1 << CEPH_I_ASYNC_CREATE_BIT) -#define CEPH_I_ERROR_FILELOCK (1 << CEPH_I_ERROR_FILELOCK_BIT) #define CEPH_I_SHUTDOWN (1 << CEPH_I_SHUTDOWN_BIT) /* -- 2.34.1