Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp3499794imm; Tue, 29 May 2018 08:15:47 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqtvw+555hKRR676z6vzQc7w+zXAWKLO9Yf6CioSPOktR5U3/z8s5u/ZWGR276STGWTGTKd X-Received: by 2002:a63:4384:: with SMTP id q126-v6mr13981417pga.294.1527606947039; Tue, 29 May 2018 08:15:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527606947; cv=none; d=google.com; s=arc-20160816; b=BEwEZzTOTJP5j81Vnj1lAIFvt9roh+SchABBfrp++p8GuFsqEvAggBj/B/lrDrjMfH rOxknL7GDW8lS0jDnujw2rMtmITi6mivnW1lNy8WtB03d722AxOF9oS/X6d8OZnCTtKa aaCjv8sz5b4ZlUuqNWwykdZmj8sLNHBpEA4z/aKZUF1upngNzbvq+ZhPMdpAGIIGAOLK oRaDQP2PDJwMgFs9N2nDCARyGz5dC00bTT0PlSZQMZ03KNd/6yFHcUGi3EO1RQdqzT7K 5JDxVnAuA9ahLVdlJKeZTWjXMPZtKaJLzqQ/Fq3kthjyuBxHZqEf9kGtR3FODSKIs5g0 l71A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=LwsJTSUT2RemjBhJkpSIUg+cLBfUDr1+MvgYud7NBTY=; b=C/AMgJCh6/mkrgLUFoIh3lomeO2LLzkHgoYkg0sVloluCiX4BvhkfdxzKvbQF+4L3O F8QBqdHyMo6Lc5Ccik301JisUcr2ChM/o7FlnzaqTSJ8P4A/Ghhdi8EuUTHNdS0fgedl 0pQ1BNizk4nBBiP2XPbrbxStNxQfFhvHLZOyLz4yl9D8b+vwpQFeK8yrFQa1dppYjpAi LcG1WZKq0//+s5Hmr+3t7jQjBgfT4GsaZjEzLp5jjzJuoUn+27QaHFczs9kH4S+ffmdC 9sXY2FrMlKnLjxbgglMHBAbG5q/sTLxjfkWPmX5LA1WkEmkcqCmmI0gles4QN3NbdU+K CmKQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 128-v6si18535406pgj.289.2018.05.29.08.15.33; Tue, 29 May 2018 08:15:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754977AbeE2PN0 (ORCPT + 99 others); Tue, 29 May 2018 11:13:26 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:53856 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935609AbeE2OoA (ORCPT ); Tue, 29 May 2018 10:44:00 -0400 Received: by mail-wm0-f65.google.com with SMTP id a67-v6so41191984wmf.3 for ; Tue, 29 May 2018 07:43:59 -0700 (PDT) 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=LwsJTSUT2RemjBhJkpSIUg+cLBfUDr1+MvgYud7NBTY=; b=fo4h1oNvxcxjihrNtaQQV+Ww2MDognLDCGJ4k/DP8qOM0e9u7mjPoUCeyA3CAc9Ad/ 70Os5Ms0xpaKFOuihC41NcUfy1GkSDpvpSOq74T9crnZTTUu9VbZBSmV4zhbsgWO2DsL WK7LyLYYKyHloVEpDQbh1L2mvDKaxKmLbJmcZnxEcKsB6jE0YcM/vjgaAWTJHBqDXxEh GV5MgLx9fwV2iQIDo22HZ4gy/aL8/Y9JPEDqa2LUHRobZt5hPD0poSGXlu4P5XNW+RSH 8kvQBpHWP+prrSxLWze+uE8MWEOojg+4l7oVHmlIVKrLp64DdP7IE6/cm2VNIcmgFBn4 vs2Q== X-Gm-Message-State: ALKqPwcEowFSd0MkrahNRfu2TJBPIlYDdXFXv1P5/dAsi+vbBg7DrVNm 9X60GO/IhklT86mBhv/A63uP+w== X-Received: by 2002:a1c:f407:: with SMTP id z7-v6mr3806557wma.143.1527605039103; Tue, 29 May 2018 07:43:59 -0700 (PDT) Received: from veci.piliscsaba.redhat.com (catv-176-63-54-97.catv.broadband.hu. [176.63.54.97]) by smtp.gmail.com with ESMTPSA id t198-v6sm18834422wmt.23.2018.05.29.07.43.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 May 2018 07:43:58 -0700 (PDT) From: Miklos Szeredi To: linux-unionfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 15/39] ovl: add helper to return real file Date: Tue, 29 May 2018 16:43:15 +0200 Message-Id: <20180529144339.16538-16-mszeredi@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180529144339.16538-1-mszeredi@redhat.com> References: <20180529144339.16538-1-mszeredi@redhat.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the common case we can just use the real file cached in file->private_data. There are two exceptions: 1) File has been copied up since open: in this unlikely corner case just use a throwaway real file for the operation. If ever this becomes a perfomance problem (very unlikely, since overlayfs has been doing most fine without correctly handling this case at all), then we can deal with that by updating the cached real file. 2) File's f_flags have changed since open: no need to reopen the cached real file, we can just change the flags there as well. Signed-off-by: Miklos Szeredi --- fs/overlayfs/file.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index a0b606885c41..db8778e7c37a 100644 --- a/fs/overlayfs/file.c +++ b/fs/overlayfs/file.c @@ -31,6 +31,66 @@ static struct file *ovl_open_realfile(const struct file *file) return realfile; } +#define OVL_SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT) + +static int ovl_change_flags(struct file *file, unsigned int flags) +{ + struct inode *inode = file_inode(file); + int err; + + /* No atime modificaton on underlying */ + flags |= O_NOATIME; + + /* If some flag changed that cannot be changed then something's amiss */ + if (WARN_ON((file->f_flags ^ flags) & ~OVL_SETFL_MASK)) + return -EIO; + + flags &= OVL_SETFL_MASK; + + if (((flags ^ file->f_flags) & O_APPEND) && IS_APPEND(inode)) + return -EPERM; + + if (flags & O_DIRECT) { + if (!file->f_mapping->a_ops || + !file->f_mapping->a_ops->direct_IO) + return -EINVAL; + } + + if (file->f_op->check_flags) { + err = file->f_op->check_flags(flags); + if (err) + return err; + } + + spin_lock(&file->f_lock); + file->f_flags = (file->f_flags & ~OVL_SETFL_MASK) | flags; + spin_unlock(&file->f_lock); + + return 0; +} + +static int ovl_real_fdget(const struct file *file, struct fd *real) +{ + struct inode *inode = file_inode(file); + + real->flags = 0; + real->file = file->private_data; + + /* Has it been copied up since we'd opened it? */ + if (unlikely(file_inode(real->file) != ovl_inode_real(inode))) { + real->flags = FDPUT_FPUT; + real->file = ovl_open_realfile(file); + + return PTR_ERR_OR_ZERO(real->file); + } + + /* Did the flags change since open? */ + if (unlikely((file->f_flags ^ real->file->f_flags) & ~O_NOATIME)) + return ovl_change_flags(real->file, file->f_flags); + + return 0; +} + static int ovl_open(struct inode *inode, struct file *file) { struct dentry *dentry = file_dentry(file); -- 2.14.3