From patchwork Fri Jan 27 17:41:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9542415 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A55C260415 for ; Fri, 27 Jan 2017 17:45:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 986BD276D6 for ; Fri, 27 Jan 2017 17:45:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D33027D4A; Fri, 27 Jan 2017 17:45:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F79B276D6 for ; Fri, 27 Jan 2017 17:45:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933215AbdA0Roo (ORCPT ); Fri, 27 Jan 2017 12:44:44 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34049 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933033AbdA0RoL (ORCPT ); Fri, 27 Jan 2017 12:44:11 -0500 Received: by mail-wm0-f68.google.com with SMTP id c85so59610535wmi.1; Fri, 27 Jan 2017 09:41:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=GieYvPsj6NZgQeDTO8/TBw+TQMhzjBOwwaZgWglRvqY=; b=gRk6xkEnDWBaX+EdkpmJloznwAAjFUTFSlQT1ugaWGTg47SUK23cv1e2rD3fa+adRH 79rUOCg2CpKlceS4z1cEQjd7l7Jtcj7MVCvVjzeIwH7s7LWgm27BtwXpmOO0vuiJCFRh j6WXxPYOw3kOPj5cfF2rZn6/F+/DFyeAdOoIb8AWxp3OymGggHz0qGIyQzLlRu+9nqpz 1fpLxveZbWeLRr3YYLBbUSctLdR3yHVX7FZCCYmRNxBH++kj2hsxvceObryRLkgedhxz RRDd/jGoObaVqYqTJn3rUA9O2Y+H/vbVv/esc0t4OleiIi6r1xQbA0J7jcNR3ej8HvU/ Fyzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=GieYvPsj6NZgQeDTO8/TBw+TQMhzjBOwwaZgWglRvqY=; b=r6NGEQIB6AIH2+Kyaf/69HOaOL4fVLQH9zBR4uVxQ6WeHN2otaUmHKUm0ne4HGfvYE KfpPxFIQsC22I50u3txmXwDJniLARCFtVr2/z2bkbWhMXAm6s5JnueMp+PwAFIkeI+SY qhQXy88f/uL22u2YJiJ8B+paIa0FnkQw0uUBciXeWAVAigRCs1hIRyiM40WB9hLnr4rX BgkMAT1pr1MO953FZazjv+eYPKByG4/XX3HDRYHnmS3SBtWPAn5hZS12Uciw3EAi50Au g2z+nUUBx4VLYVDesaahy72I4MUDVrgc1FtKMiZ+YppEf4W0xVu6ENpsxi66Pa+lyaUW 4XPA== X-Gm-Message-State: AIkVDXLXSg+86Uy5aGRbN0cl9lnJJRyCDcWCTxgNewytvs8phMhnt69AqBW9EqTp1CDYMw== X-Received: by 10.28.10.68 with SMTP id 65mr4240067wmk.63.1485538901217; Fri, 27 Jan 2017 09:41:41 -0800 (PST) Received: from localhost.localdomain (bzq-79-176-143-83.red.bezeqint.net. [79.176.143.83]) by smtp.gmail.com with ESMTPSA id k4sm4875522wmf.22.2017.01.27.09.41.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 09:41:40 -0800 (PST) From: Amir Goldstein To: Miklos Szeredi Cc: Jan Kara , Christoph Hellwig , Al Viro , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3] ovl: properly implement sync_fs() Date: Fri, 27 Jan 2017 19:41:29 +0200 Message-Id: <1485538889-14240-1-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP overlayfs syncs all inode pages on sync_filesystem(), but it also needs to call s_op->sync_fs() of upper fs for metadata sync. This fixes correctness of syncfs(2) as demonstrated by following xfs specific test: xfs_sync_stats() { echo $1 echo -n "xfs_log_force = " grep log /proc/fs/xfs/stat | awk '{ print $5 }' } xfs_sync_stats "before touch" touch x xfs_sync_stats "after touch" xfs_io -c syncfs . xfs_sync_stats "after syncfs" xfs_io -c fsync x xfs_sync_stats "after fsync" xfs_io -c fsync x xfs_sync_stats "after fsync #2" When this test is run in overlay mount over xfs, log force count does not increase with syncfs command. Reviewed-by: Christoph Hellwig Signed-off-by: Amir Goldstein Reviewed-by: Christoph Hellwig --- fs/overlayfs/super.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) Miklos, Re-posting this one proven bug fix detached from the overlay freeze series that needs more work. If you have some free cycles, I would love to get some feedback on the change "vfs: freeze protect overlay inode on file_start_write()" Thanks, Amir. v3: - Added reviewed-by hch - Detached from ovl freeze series v2: - Add test case to commit msg v1: - Same code as v3 diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index 6792bb7..346f668 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -160,6 +160,25 @@ static void ovl_put_super(struct super_block *sb) kfree(ufs); } +static int ovl_sync_fs(struct super_block *sb, int wait) +{ + struct ovl_fs *ufs = sb->s_fs_info; + struct super_block *upper_sb; + int ret; + + if (!ufs->upper_mnt) + return 0; + upper_sb = ufs->upper_mnt->mnt_sb; + if (!upper_sb->s_op->sync_fs) + return 0; + + /* real inodes have already been synced by sync_filesystem(ovl_sb) */ + down_read(&upper_sb->s_umount); + ret = upper_sb->s_op->sync_fs(upper_sb, wait); + up_read(&upper_sb->s_umount); + return ret; +} + /** * ovl_statfs * @sb: The overlayfs super block @@ -222,6 +241,7 @@ static int ovl_remount(struct super_block *sb, int *flags, char *data) static const struct super_operations ovl_super_operations = { .put_super = ovl_put_super, + .sync_fs = ovl_sync_fs, .statfs = ovl_statfs, .show_options = ovl_show_options, .remount_fs = ovl_remount,