From patchwork Sun Aug 26 16:25:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10576303 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 335DF15A7 for ; Sun, 26 Aug 2018 16:23:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3018C29571 for ; Sun, 26 Aug 2018 16:23:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 246D7298B3; Sun, 26 Aug 2018 16:23:42 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 C885D29571 for ; Sun, 26 Aug 2018 16:23:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726930AbeHZUGk (ORCPT ); Sun, 26 Aug 2018 16:06:40 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:50462 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726872AbeHZUGk (ORCPT ); Sun, 26 Aug 2018 16:06:40 -0400 Received: by mail-wm0-f65.google.com with SMTP id s12-v6so5890101wmc.0; Sun, 26 Aug 2018 09:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ip5waqA6aw/8c/zf472FD2ASqTVdXpkZnp0uHu/P5hI=; b=qCt8gQDqQ4+AzITC6hLN8C+1Eb8wmRxJBS/4/50MeahNm9v4P7msKZjRkyRhoUIGDg lUl8L/6y0XkSi7JRspcwLBTtBZrTCx2FVorheh3MPXylLwm6ZI/DurWNuM7R4iqn/cTW d+jN58tW1ZLiOKCejXvLObTElNWgkPzUVK1SqRGSBhrMQcUz9f2XUM2TwikvFuqT0Qki bKm7uBHvCSjqEiKdnXboAlOnqATNbSm7Ti/G4reUrAbltfZsnqI3T+fCe0fA94o+LRaP jbR7ornExRriZvcx1Xdgt7b55V8GjC8cAdJjESSi1hX3gd1IJCbeCu0ksLw4boHQ0imw 9Gaw== 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:in-reply-to :references; bh=Ip5waqA6aw/8c/zf472FD2ASqTVdXpkZnp0uHu/P5hI=; b=aXBgiSdZfeAkajWkwMTt4/RYd/3vl/XqqPJufKvvN2jWNgZYu2Y/GTpAhndSsz6Q9H DWdA1ui54ow71YxeEkQ5dIKJBjZHfQWiuulTJd4yv+ETvnaLfU/8yPyrauzlIX/NbUDb xczKSQAGjxwrXRxPheEtFJ+gJP7R/98ksaqDWJX/kxVeMAE56EFYAqiHGfMqR4Tm87qU ca+4lM1WFYYJKrg0gVrL7PfUMBKOStqub9v5AB/gOrsKr4FPFNsTT7dwGkFQOFIydSLO DD5GuKBUdNshAezjUPN1UTN4hXNcwgCcH2C+JUmvcaO96HgGpTarmHZpBApdbASFSXqW 8iUw== X-Gm-Message-State: APzg51CTZjCAAPvSoPISVsbApMpQR3wWLMBbaXBlTjNcUcQqizLvXHW3 YShXDPk40veECkbRMwEfw0I= X-Google-Smtp-Source: ANB0VdY4geV4GEu7d78yi7lPAT3s4ClUSDE+EaTqxjWTQfn+2wGyvK7LsEum1fC9FaQHz94Va4uM2Q== X-Received: by 2002:a1c:752:: with SMTP id 79-v6mr3786200wmh.59.1535300618599; Sun, 26 Aug 2018 09:23:38 -0700 (PDT) Received: from localhost.localdomain (bzq-166-168-31-246.red.bezeqint.net. [31.168.166.246]) by smtp.gmail.com with ESMTPSA id o33-v6sm27559238wrf.11.2018.08.26.09.23.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Aug 2018 09:23:38 -0700 (PDT) From: Amir Goldstein To: Miklos Szeredi Cc: Al Viro , Dave Chinner , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v2 6/6] vfs: fix sync_file_range syscall on an overlayfs file Date: Sun, 26 Aug 2018 19:25:17 +0300 Message-Id: <1535300717-26686-7-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535300717-26686-1-git-send-email-amir73il@gmail.com> References: <1535300717-26686-1-git-send-email-amir73il@gmail.com> 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 For an overlayfs file/inode, page io is operating on the real underlying file, so sync_file_range() should operate on the real underlying file mapping to take affect. Fixes: d1d04ef8572b ("ovl: stack file ops") Signed-off-by: Amir Goldstein --- fs/sync.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/fs/sync.c b/fs/sync.c index b54e0541ad89..28a26333844d 100644 --- a/fs/sync.c +++ b/fs/sync.c @@ -286,6 +286,7 @@ int ksys_sync_file_range(int fd, loff_t offset, loff_t nbytes, { int ret; struct fd f; + struct file *file; struct address_space *mapping; loff_t endbyte; /* inclusive */ umode_t i_mode; @@ -330,16 +331,21 @@ int ksys_sync_file_range(int fd, loff_t offset, loff_t nbytes, if (!f.file) goto out; - i_mode = file_inode(f.file)->i_mode; + /* + * XXX: We need to use file_real() for overlayfs stacked file because + * page io is operating on the real underlying file/inode. + */ + file = file_real(f.file); + i_mode = file_inode(file)->i_mode; ret = -ESPIPE; if (!S_ISREG(i_mode) && !S_ISBLK(i_mode) && !S_ISDIR(i_mode) && !S_ISLNK(i_mode)) goto out_put; - mapping = f.file->f_mapping; + mapping = file->f_mapping; ret = 0; if (flags & SYNC_FILE_RANGE_WAIT_BEFORE) { - ret = file_fdatawait_range(f.file, offset, endbyte); + ret = file_fdatawait_range(file, offset, endbyte); if (ret < 0) goto out_put; } @@ -352,7 +358,7 @@ int ksys_sync_file_range(int fd, loff_t offset, loff_t nbytes, } if (flags & SYNC_FILE_RANGE_WAIT_AFTER) - ret = file_fdatawait_range(f.file, offset, endbyte); + ret = file_fdatawait_range(file, offset, endbyte); out_put: fdput(f);