From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.219.44 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795021420; b=rCkQOlePtsD6oCou6jTElsVktMiTcdflaprhPfY5wxl45BHSS5Mle2Dckujz6xPxIdVW 1h/5zrrW6xV3JLUsFgxk7OHMFkbd0KZF4FnPNnFHMFgweV5VfzaYBHvhSdGhhL42AOV/C 2bqhE7n0f8D43mILenOp4aNFaVmta8v3G7aBpy3ASbkXfm9GOFU13vPYS1BaIyWEMvfY2 jWco0fb8uiXqImw17bW5uBl1YWDy+ye8Hq4T355uZK5QWNEqoJa1gBhF+R5EVhcbr7DpQ +AhFna8mDRLXVlrks9JhljXEfpdvdoWGOOU2JOzRXc+jSX8pGGpGneiw+hlY181ICEg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795021420; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer: X-Developer-Signature:X-Developer-Key; bh=M6gwJXb2gxib6r9BoJFITNoCXtYKADtb0yPwtxpwaOo=; b=1bmDDXmjCWdAhNSRuFmPxS/UIkEl5XFBGurgRMw7EtSP5uppE86iUr1/CZe2esWyA9ka gJ5ZIKNy1U8c98/ZboSgZPj9L98gTbcGiKz7EUIkYOYzXiMMlHvYDnqDnqaeelH2PSOQ5 IBfNzsMm0IqK8nvf0+qey+wGXUiIC+lxhtdr46RsJjNdOSVGwKwjuvYfBACM9x7l/BOt9 Dpk5j4wuY9p/4dj5/Tm1yLP/+oMzjRvXGVnxRSOM/QdZ172w6zFb5wH1R5mWD851KD8Sl fG9E27ZjSRBTQWh8VmyxQO85GRXbrNgwwylgj0uQZF9HH/+lZHBz98kG24myxBKXQyw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none header.from=toxicpanda.com; spf=pass smtp.mailfrom=toxicpanda.com; dkim=pass header.d=toxicpanda.com header.i=@toxicpanda.com header.a=rsa-sha256 header.s=google header.b=h5wwtyx9; arc=none smtp.remote-ip=209.85.219.44 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ADBC860A2624 for ; Wed, 18 Nov 2026 17:03:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org ADBC860A2624 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toxicpanda.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=toxicpanda.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=toxicpanda.com header.i=@toxicpanda.com header.a=rsa-sha256 header.s=google header.b=h5wwtyx9 Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-92123588d53so243116d6.1 for ; Wed, 18 Nov 2026 09:03:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda.com; s=google; t=1795021419; x=1795626219; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=M6gwJXb2gxib6r9BoJFITNoCXtYKADtb0yPwtxpwaOo=; b=h5wwtyx983KqxvtzYtyCP4Jlk50BvZnUZzdAgv9BdQ6nie5VPNi/h09I+8TpOGvzNs qOYJ51QcwElFNZvVu3Wt2ycNChH3o+eCxP1MrgLSVruh0VKLQe+P0SFFuND1fLCrTeRk E6L3QyDghF2m9Fl68ZdU+N2pdvgmEdTtJ6xs8pq+Eyz0wtezENllQGj9cI+yslFmtUzW Jj1rCmmY8+GO0LECNn0WhrruaAiWUyabvTb/UX5k3wVhFRSBtF3l87vA1WCyvX4THSui j1kFei1I1g2Ri1BR+iUtmoAZFfttYZEQSmk0bEzDMmy3Yb5o/PXBS/Q+DMEut2by/f9q npqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795021419; x=1795626219; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=M6gwJXb2gxib6r9BoJFITNoCXtYKADtb0yPwtxpwaOo=; b=CCKxNOCi1eyTFGzxrlK7DbBQoui58dC4lvMkqbkPFgdLZFviW/gD7m0dqH7QDqYPbU 0kpl+iZ6X68tGGpBlksMqYhCYoJkcGOPa/9e7+8K/tN4x/fLNK9cPA1XtHk1PyTilzD+ djqS7Au1mrh72m/kGlamv3eoVxPhrpTNVMmp0dVHKDGPbcDMdO/AO9pwelxSDt1Y7qsA KdRKNbSRCUvKh5gPfL8YD2FUp3yF8KbNfFAgjAuYmPU2ZGXrDvfo3coibl+vAxXhcaEA asGzM0umVwF0SzUMfE7tnz4brwLeX5P5tm20XMkfgGwIIIi7mdaauJJ7IpnAdwZ2bBGn w65Q== X-Forwarded-Encrypted: i=1; AL+hErE7EHV4HTfJMWbYyToH5YlREnmVc4XMLt7FlGUecgsVMkWCo+h4XPQdOMKS0lyX+P2HKnTwEi5oLGuR5Q4=@vger.kernel.org X-Gm-Message-State: APuU4Z89rtfxHxzO/DK6aH2UzJLlZx5ER01Rsk2UyH2rkUUP+DWoWeFJ 2sLGW3sbQyD6rozZ4eAp76Yb/ir0DtNc74idgftt9q2mZZRmSY7wwSARN08g5gI3bUE= X-Gm-Gg: AZFdTZe8KUrk+OvFVdfVrSN8yId9BjTfefif73p9qzsk8GYSlwXPqAgI6rGoskOznEZ xCp8QP9ZP9nvJHZjZZDubkNbiRP1Jdwr0T/JRibwr19/186RUVcBGCLjF4WjDQtEFevPcc4Dnty +pnU9EYy/k79ZoO/5Agl9qipRMSIM3X3TUcxkPe1QjvdrbUUHAvncu3RxsOSMlnFvGV6kC7LQhB MfP4jcKEL0TAnBj7bG6XaCC4XegyBlIuPw0FuYijQE+SywohqooI3Mrm6Ln943NDo/6UiqtrbbX 4EfV0oocXZURmiVtqH3oHj6oLFpkCMfEB6oSP2doZBxsbTUHikAu/usd/lnjLuIqwMN+Snu2FYK +Sh3da7cBg2/mSBKHFIvEfZ9aHH/+wRowyibXbNE2/TRYruKEAWQKZyVa/Hk+n1e11cskqo1svh DYDDSpVggY9JfriXAeR+KB3pz3Go55dh4VCr/+gy6fcI0+K/FPQY2xm/P2rONVI2tOmPqo+R1VR 4pPBWLS6Y//Tx5rkH2I++mrze4SdnvBPKTYNb+XThqnJgEnJG8GyYJIi8+inrrTCAoJ1v8kzZQ3 vLED2uJyA0bWwqIhYASuVMv5SLR1GK7hbLIl6W/X1UgPfeU= X-Received: by 2002:a05:6214:3283:b0:91e:f506:5dd6 with SMTP id 6a1803df08f44-9212431c63cmr1633126d6.25.1795021418473; Wed, 18 Nov 2026 09:03:38 -0800 (PST) Received: from toxicpanda.com ([153.61.196.240]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-92114d5558bsm26530406d6.23.2026.11.18.09.03.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2026 09:03:37 -0800 (PST) From: Josef Bacik Date: Wed, 18 Nov 2026 17:03:26 +0000 Subject: [PATCH v7 3/7] fs: add sync_fs_and_bdev() X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261118-b4-ovl-containerized-sync-v7-3-54f45743fe55@toxicpanda.com> References: <20261118-b4-ovl-containerized-sync-v7-0-54f45743fe55@toxicpanda.com> In-Reply-To: <20261118-b4-ovl-containerized-sync-v7-0-54f45743fe55@toxicpanda.com> To: Miklos Szeredi , Amir Goldstein , Christian Brauner Cc: Alexander Viro , Jan Kara , Christoph Hellwig , Chris Mason , Chengguang Xu , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Josef Bacik X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openssh-sha256; t=1795021413; l=3528; i=josef@toxicpanda.com; h=from:subject:message-id; bh=VgFAjK6/pmygZeLoXZRAr4NOxj7vW3wdwgCAbaJfu4g=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgUBr36M/n0nWN0DNbnxwzIiCZez6MG JiruuNaSCI/zXsAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QIKPEs2/oj58xMvoTPppV9N6Jkq6vIHs5zmNVB7xMWWJ0Q7qr1VkLk2vBWBFUueDe5HlROQC77L cZ6B/xDA7oAk= X-Developer-Key: i=josef@toxicpanda.com; a=openssh; fpr=SHA256:C8kOX2QUJCMqnCX+KEeoqRAjLo9L+ELOSH2NSAJHqGA sync_filesystem() writes the inodes, calls ->sync_fs() and writes the block device, first without waiting and then with. overlayfs is about to write the inodes of its upper filesystem by itself, only those that were modified through the overlay, and needs the other two steps as they are. Move them to a helper so that overlayfs does not have to know what they are. sync_filesystem() calls the inner helper, so it still tests for a read-only filesystem and for s_umount once. The exported function does both tests for its callers. Nothing calls the exported function yet, no functional change intended. Suggested-by: Christian Brauner Signed-off-by: Josef Bacik --- fs/sync.c | 52 +++++++++++++++++++++++++++++++++++++++------------- include/linux/fs.h | 1 + 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/fs/sync.c b/fs/sync.c index 4a84dd837b86..9adc7076c24d 100644 --- a/fs/sync.c +++ b/fs/sync.c @@ -22,6 +22,42 @@ #define VALID_FLAGS (SYNC_FILE_RANGE_WAIT_BEFORE|SYNC_FILE_RANGE_WRITE| \ SYNC_FILE_RANGE_WAIT_AFTER) +static int __sync_fs_and_bdev(struct super_block *sb, bool wait) +{ + int ret; + + if (sb->s_op->sync_fs) { + ret = sb->s_op->sync_fs(sb, wait); + if (ret) + return ret; + } + if (!wait) + return sync_blockdev_nowait(sb->s_bdev); + return sync_blockdev(sb->s_bdev); +} + +/** + * sync_fs_and_bdev - finish a sync whose inodes the caller has written + * @sb: the superblock, the caller holds s_umount + * @wait: wait for the I/O to complete + * + * These are the steps of sync_filesystem() that follow the writing of the + * inodes. This is for a caller that has already written the inodes it cares + * about. Like sync_filesystem() it does nothing on a read-only filesystem. + * + * Return: 0 on success, a negative error code otherwise. + */ +int sync_fs_and_bdev(struct super_block *sb, bool wait) +{ + WARN_ON(!rwsem_is_locked(&sb->s_umount)); + + if (sb_rdonly(sb)) + return 0; + + return __sync_fs_and_bdev(sb, wait); +} +EXPORT_SYMBOL_GPL(sync_fs_and_bdev); + /* * Write out and wait upon all dirty data associated with this * superblock. Filesystem data as well as the underlying block @@ -29,7 +65,7 @@ */ int sync_filesystem(struct super_block *sb) { - int ret = 0; + int ret; /* * We need to be protected against the filesystem going from @@ -52,22 +88,12 @@ int sync_filesystem(struct super_block *sb) * at a time. */ writeback_inodes_sb(sb, WB_REASON_SYNC); - if (sb->s_op->sync_fs) { - ret = sb->s_op->sync_fs(sb, 0); - if (ret) - return ret; - } - ret = sync_blockdev_nowait(sb->s_bdev); + ret = __sync_fs_and_bdev(sb, false); if (ret) return ret; sync_inodes_sb(sb); - if (sb->s_op->sync_fs) { - ret = sb->s_op->sync_fs(sb, 1); - if (ret) - return ret; - } - return sync_blockdev(sb->s_bdev); + return __sync_fs_and_bdev(sb, true); } EXPORT_SYMBOL(sync_filesystem); diff --git a/include/linux/fs.h b/include/linux/fs.h index 99caef43ff3c..2b016d9dfb88 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2619,6 +2619,7 @@ extern void __init vfs_caches_init(void); void emergency_thaw_all(void); extern int sync_filesystem(struct super_block *); +int sync_fs_and_bdev(struct super_block *sb, bool wait); extern const struct file_operations def_blk_fops; extern const struct file_operations def_chr_fops; -- 2.55.0