From nobody Tue Dec 2 03:00:42 2025 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (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 B79D924A076 for ; Tue, 18 Nov 2025 00:27:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763425675; cv=none; b=td/nNyKOJHH4UAIw7pBZb8Mu2gB5FFZWJfdzBLQ7GBENvOkFwOODm/Tu5gtBq6J9cM0wdC2goSyl/i1LgXZpyWd/qZP6zARcQiz0qZKkS/0HntnfSmu5HbzYIESuANhELRxHqjq/+PYtIntmzkRDHSzWtLqlEO1E8+N/Qru/xiQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763425675; c=relaxed/simple; bh=XwQdHva/FhCqWzVeN2j1jp/bViRFcs+OvOOWLOMc7II=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WQ/9CTFb1H5in8Ftc2U2ps0po/Q14NHahy8V7IHOlhfoGZLWT2WBKlNdG1mSpmWWFKBCxYtKd1zM7Ugd+JS106BVtCwDJx8BAkBQ/ovz5ovO+MjyhPVJ2skH/rP4OAibz405AGaBheBRKhwwaUVGIUUn+vppSbkYkqgD5tdZWoc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IOBXTXRl; arc=none smtp.client-ip=209.85.218.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IOBXTXRl" Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-b7355f6ef12so831562866b.3 for ; Mon, 17 Nov 2025 16:27:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763425672; x=1764030472; 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=rt4dq7ItByAk2pC7B8R1HF5wkZzUmgIJnRllhICTu3g=; b=IOBXTXRliI68NsX+7JRDJe9yb7qF32LA2i6MpR1XGX+LMZd1uMQnECjpaAXoUhtFun C+BQuTV9BHvvPpTMAG12iMdkVXmKT97NO8o4SGZ5UjDwierUOviSiLQ0WEUsKwdN8qEx yuF73RvTWzG1dYnVYFFbEB5Ybz88TH9wTcjMFA+Sp3Lp1+6i0YRdpiETbo3O38az5enr 56/wC9/FZt83n26b8JUPo02ScRy6eSpUcgZoZGVZr1B7tZQ1hDiwnSdJQnssFRC0QQn9 tVnDlQAe0S1FOcxdEramtBjvCOmsqf7uAfJ7eW2aKUYQw8tO8fZmTqCc8JWPSbN/J5Ti 4BNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763425672; x=1764030472; 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=rt4dq7ItByAk2pC7B8R1HF5wkZzUmgIJnRllhICTu3g=; b=Y67hxpwFHOB2U8Hyh+nYHNIK5oM6IZNKsgxXl4Fu4KIPlBhUu8uJ6I6odwE4yQ5wjz F+W7ejjnngUFboi9K69Kh7d+Lf2KwUHq4i00WltbMEAAQ6cXqB+WbtyqqgOxZ8NMok/g 1wFjWKO+k8+DavKA/W6Uab6HDiysjBflLF42gUBAOLdZ+IKwqo1pPy18A5dJp9blyclF qloAimYxmbR25pquoQLwJDq6lv66w6a6PPPff8PpYW9JTxoP1ILPrzAw+9E4qhaytfUF VHf65mJwHpEvkYnLvX8Oel6mMJvzjRiZQVCM8di8sjVysUymn/EAvpbPKM/YNWiXE90D meIw== X-Forwarded-Encrypted: i=1; AJvYcCXVlE9NgopgcvLQXktJ3s+0/qfbnGK3Pbm/RCQWwKi5W0AxtWkimyXCTJNL6lO0nqHJtM8Af5suLVskNXA=@vger.kernel.org X-Gm-Message-State: AOJu0YwLMtX+Yxx6k8dLSF37QnRQ8r2YxvY9/R9b+IjAXgR8a//nlWWc LWTpWOPGLVVXxhRGK6l5y/RrYRCpXqGYcbSW+0GU733WSkJuyJcIgWHF X-Gm-Gg: ASbGncvxa2gjpxGdRbIbsnOTyeYn1tqc3N5qU8dCJSOu4kp8nTPSChKE1eIRBGE2cNV AzuFfYFjloLSKHfIPE5K7+OVxRq+yFO3O4Mtm+Jwn6I4+V1AHlkYnzr7maKSLUyfK0xD+j1R8Bo k5ptOF9Z5iNVTJksXDVNA4MPTEd2xn1uEU6YrQx06S/RL3BbqhMfPZqRj+mON+unCGfhqXCTE4Q +uQlN3BquI8HlYukSPZFR+3wOHsHhK5lLs+JgNdufg1VR5JW2feoWZVPaXKxlRbhL5vw0uvOSLm MPTAJrSFCJw0NQebj4O7E4gi6ilSYFXBKDND+CeqOqBYdsNFAyqXNv1Drx0JccLgiyantnKaNdb ssJhOSYCTDi3qsxkaMVbeVYBFcIMjgpYu36/jkiHDpqRHX6It634+6Qk8qZhmnV2zUUxmW+B8Qp hB X-Google-Smtp-Source: AGHT+IEexWh7CvuUtSk5yy3gOVy9n+9enrYCMgGW/NXI6iyxOLm5VeyJR2i1KkhzS5vQaeod62ruJg== X-Received: by 2002:a17:906:3416:b0:b73:9e51:7f with SMTP id a640c23a62f3a-b739e5101c8mr470418866b.22.1763425671992; Mon, 17 Nov 2025 16:27:51 -0800 (PST) Received: from eray-kasa.. ([2a02:4e0:2d08:f72:eb64:1d0d:5855:afe7]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b734fda8a86sm1172606466b.52.2025.11.17.16.27.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 16:27:51 -0800 (PST) From: Ahmet Eray Karadag To: mark@fasheh.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com Cc: ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org, david.hunter.linux@gmail.com, skhan@linuxfoundation.org, Ahmet Eray Karadag , Albin Babu Varghese Subject: [PATCH 2/2] ocfs2: Convert remaining read-only checks to ocfs2_emergency_state Date: Tue, 18 Nov 2025 03:26:46 +0300 Message-ID: <025589c07fd51a0693fffe8337184e14ec6d92bc.1763337347.git.eraykrdg1@gmail.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To centralize error checking, follow the pattern of other filesystems like ext4 (which uses `ext4_emergency_state()`), and prepare for future enhancements, this patch introduces a new helper function: `ocfs2_emergency_state()`. The purpose of this helper is to provide a single, unified location for checking all filesystem-level emergency conditions. In this initial implementation, the function only checks for the existing hard and soft read-only modes, returning -EROFS if either is set. This provides a foundation where future checks (e.g., for fatal error states returning -EIO, or shutdown states) can be easily added in one place. This patch also adds this new check to the beginning of `ocfs2_setattr()`. This ensures that operations like `ftruncate` (which triggered the original BUG) fail-fast with -EROFS when the filesystem is already in a read-only state. Co-developed-by: Albin Babu Varghese Signed-off-by: Albin Babu Varghese Signed-off-by: Ahmet Eray Karadag --- fs/ocfs2/buffer_head_io.c | 4 ++-- fs/ocfs2/file.c | 17 ++++++++++------- fs/ocfs2/inode.c | 3 +-- fs/ocfs2/move_extents.c | 5 +++-- fs/ocfs2/resize.c | 8 +++++--- fs/ocfs2/super.c | 2 +- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c index 8f714406528d..c43d4a58aa9a 100644 --- a/fs/ocfs2/buffer_head_io.c +++ b/fs/ocfs2/buffer_head_io.c @@ -434,8 +434,8 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb, BUG_ON(buffer_jbd(bh)); ocfs2_check_super_or_backup(osb->sb, bh->b_blocknr); =20 - if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) { - ret =3D -EROFS; + ret =3D ocfs2_emergency_state(osb); + if (ret < 0) { mlog_errno(ret); goto out; } diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 03a98985ac92..c299b73cf4ec 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -179,8 +179,9 @@ static int ocfs2_sync_file(struct file *file, loff_t st= art, loff_t end, file->f_path.dentry->d_name.name, (unsigned long long)datasync); =20 - if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) - return -EROFS; + ret =3D ocfs2_emergency_state(osb); + if (ret < 0) + return ret; =20 err =3D file_write_and_wait_range(file, start, end); if (err) @@ -209,7 +210,7 @@ int ocfs2_should_update_atime(struct inode *inode, struct timespec64 now; struct ocfs2_super *osb =3D OCFS2_SB(inode->i_sb); =20 - if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) + if (ocfs2_emergency_state(osb)) return 0; =20 if ((inode->i_flags & S_NOATIME) || @@ -1949,8 +1950,9 @@ static int __ocfs2_change_file_space(struct file *fil= e, struct inode *inode, handle_t *handle; unsigned long long max_off =3D inode->i_sb->s_maxbytes; =20 - if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) - return -EROFS; + ret =3D ocfs2_emergency_state(osb); + if (ret < 0) + return ret; =20 inode_lock(inode); =20 @@ -2713,8 +2715,9 @@ static loff_t ocfs2_remap_file_range(struct file *fil= e_in, loff_t pos_in, return -EINVAL; if (!ocfs2_refcount_tree(osb)) return -EOPNOTSUPP; - if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) - return -EROFS; + ret =3D ocfs2_emergency_state(osb); + if (ret < 0) + return ret; =20 /* Lock both files against IO */ ret =3D ocfs2_reflink_inodes_lock(inode_in, &in_bh, inode_out, &out_bh); diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 415ad29ec758..dca8db61bc0f 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -1586,8 +1586,7 @@ static int ocfs2_filecheck_repair_inode_block(struct = super_block *sb, trace_ocfs2_filecheck_repair_inode_block( (unsigned long long)bh->b_blocknr); =20 - if (ocfs2_is_hard_readonly(OCFS2_SB(sb)) || - ocfs2_is_soft_readonly(OCFS2_SB(sb))) { + if (ocfs2_emergency_state(OCFS2_SB(sb))) { mlog(ML_ERROR, "Filecheck: cannot repair dinode #%llu " "on readonly filesystem\n", diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c index 86f2631e6360..f586593b3a63 100644 --- a/fs/ocfs2/move_extents.c +++ b/fs/ocfs2/move_extents.c @@ -898,8 +898,9 @@ static int ocfs2_move_extents(struct ocfs2_move_extents= _context *context) struct buffer_head *di_bh =3D NULL; struct ocfs2_super *osb =3D OCFS2_SB(inode->i_sb); =20 - if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) - return -EROFS; + status =3D ocfs2_emergency_state(osb); + if (status < 0) + return status; =20 inode_lock(inode); =20 diff --git a/fs/ocfs2/resize.c b/fs/ocfs2/resize.c index b0733c08ed13..d9f5e1d065b4 100644 --- a/fs/ocfs2/resize.c +++ b/fs/ocfs2/resize.c @@ -276,8 +276,9 @@ int ocfs2_group_extend(struct inode * inode, int new_cl= usters) u32 first_new_cluster; u64 lgd_blkno; =20 - if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) - return -EROFS; + ret =3D ocfs2_emergency_state(osb); + if (ret < 0) + return ret; =20 if (new_clusters < 0) return -EINVAL; @@ -466,7 +467,8 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_n= ew_group_input *input) u16 cl_bpc; u64 bg_ptr; =20 - if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) + ret =3D ocfs2_emergency_state(osb); + if (ret < 0) return -EROFS; =20 main_bm_inode =3D ocfs2_get_system_file_inode(osb, diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 53daa4482406..c6019d260efc 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -2487,7 +2487,7 @@ static int ocfs2_handle_error(struct super_block *sb) rv =3D -EIO; } else { /* default option */ rv =3D -EROFS; - if (sb_rdonly(sb) && (ocfs2_is_soft_readonly(osb) || ocfs2_is_hard_reado= nly(osb))) + if (sb_rdonly(sb) && ocfs2_emergency_state(osb)) return rv; =20 pr_crit("OCFS2: File system is now read-only.\n"); --=20 2.43.0