Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp3493338imm; Tue, 29 May 2018 08:10:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpnFhmIJzzT9fKGMxLYg8dPWkX2XHv0GutqsIseJeGwX0can/T18rM0eS7IrvbMt2Bpk1k/ X-Received: by 2002:a17:902:8c81:: with SMTP id t1-v6mr17760761plo.310.1527606604930; Tue, 29 May 2018 08:10:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527606604; cv=none; d=google.com; s=arc-20160816; b=rwTUpybCA8S6OlTOHnocREu6cESdl3pXyN5VY8dRZo4XMs4p9VsSGfNggDwEV+jjGx qkkjPnAaTnBJoFMqEm5SlXAojwstplCQyLP3/TAy2TGhmQWxV0jRW/DgzDNtaUeyrPMz oiHe3GZt4cIaAkvUZQllDGP+yCDnR9nVpQhgjvSYgON/OwFrNFaveRdtNDowbQe17pSc 2RbWH+bmC/saUiqwqQzlWTgnOb7vCWFhBBKGV3AOXP/jOsODcvtcOoamw6nZFOOLXzX6 nfwqWZVZFsoMpbe6EXE9aRpg0ixyZFEFZo7bg511++fPjQTGtuh77e0xmLNKtL8X6kFV lXhw== 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=mmDu6Q7CRz229rOuGY4MF5o3TUE0zkOiTYZ8FUcB/mc=; b=FqdD9QR7NJVekPS6eTNAKhfcjFaaGgAMjYz+SaRxPHb7a+iUT3V3xA/KmYR+1Ig5px nLapYzPQuT9vxyChZadz118fPUnrhp+61Yrxqyxvf6fmpHL+5KcEMCkuK/yEl7VYugTK D48wf01xeDBnxiY4Foz72ZIWRLneNlQTBcvQZbZtcx+VyhWvKARr0kLFbT7oOU1vTFxu oEJkehXLEsB4U61Gp7b57UfjoplmoUxurQ08uWMObTOASpvkfhZIjPNs4AF/r6Gd8jw6 q36OGyceaFf+PhiXH+QvE/Y/GaVGrOcCkgd2X1zeYCDA5J6ALdoYg01ZvgiMQ4zgqjTK Ioxg== 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 r18-v6si25472206pgd.143.2018.05.29.08.09.50; Tue, 29 May 2018 08:10:04 -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 S935733AbeE2PJV (ORCPT + 99 others); Tue, 29 May 2018 11:09:21 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33816 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935718AbeE2OoL (ORCPT ); Tue, 29 May 2018 10:44:11 -0400 Received: by mail-wr0-f195.google.com with SMTP id j1-v6so25987968wrm.1 for ; Tue, 29 May 2018 07:44:10 -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=mmDu6Q7CRz229rOuGY4MF5o3TUE0zkOiTYZ8FUcB/mc=; b=b/KcSLYu4n09vjdZl7hGtuYbBu+p1wBJDWOO2nzWX8pCIZUtbpC8A59pcTLAvgOZdh 22zdelO1vQ0QJ1ILu8DYCN+XqD+IbkmPdoTH/JA8VGI2hH63H/8JtwH+X0z2F7d8OIPF UxJDETK5xwMn93Kea8AtReXcEhNrPr/zEdpRQyV5NniaeMvj82JwjUw/6rt6ByshTktL ObqSpFtISuSEm85hvTHY8pyT6yYICNJB2W5k3EaYIxaWQesTGlFK8NQHNTl29dUc/Kye 4rKvKj9GpRg+iBNbdeRwJkrXU9IaGLauWY4noVpej6H5PXdo35f0M+5OoP3oFgfl9DXB aXcA== X-Gm-Message-State: ALKqPweFsGZvm+yVtw6Lium+qMb3oHrgG2adq+4YMy9aMDaEkbPSiyTE 5VDpHnnYuRBKDbccyi5i3VvHeA== X-Received: by 2002:adf:e392:: with SMTP id e18-v6mr14146025wrm.94.1527605050055; Tue, 29 May 2018 07:44:10 -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.44.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 May 2018 07:44:09 -0700 (PDT) From: Miklos Szeredi To: linux-unionfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 24/39] ovl: add reflink/copyfile/dedup support Date: Tue, 29 May 2018 16:43:24 +0200 Message-Id: <20180529144339.16538-25-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 Since set of arguments are so similar, handle in a common helper. Signed-off-by: Miklos Szeredi --- fs/overlayfs/file.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index e5e7ccaaf9ec..ef4bcc80572f 100644 --- a/fs/overlayfs/file.c +++ b/fs/overlayfs/file.c @@ -385,6 +385,90 @@ static long ovl_compat_ioctl(struct file *file, unsigned int cmd, return ovl_ioctl(file, cmd, arg); } +enum ovl_copyop { + OVL_COPY, + OVL_CLONE, + OVL_DEDUPE, +}; + +static s64 ovl_copyfile(struct file *file_in, loff_t pos_in, + struct file *file_out, loff_t pos_out, + u64 len, unsigned int flags, enum ovl_copyop op) +{ + struct inode *inode_out = file_inode(file_out); + struct fd real_in, real_out; + const struct cred *old_cred; + s64 ret; + + ret = ovl_real_fdget(file_out, &real_out); + if (ret) + return ret; + + ret = ovl_real_fdget(file_in, &real_in); + if (ret) { + fdput(real_out); + return ret; + } + + old_cred = ovl_override_creds(file_inode(file_out)->i_sb); + switch (op) { + case OVL_COPY: + ret = vfs_copy_file_range(real_in.file, pos_in, + real_out.file, pos_out, len, flags); + break; + + case OVL_CLONE: + ret = vfs_clone_file_range(real_in.file, pos_in, + real_out.file, pos_out, len); + break; + + case OVL_DEDUPE: + ret = vfs_dedupe_file_range_one(real_in.file, pos_in, + real_out.file, pos_out, len); + break; + } + revert_creds(old_cred); + + /* Update size */ + ovl_copyattr(ovl_inode_real(inode_out), inode_out); + + fdput(real_in); + fdput(real_out); + + return ret; +} + +static ssize_t ovl_copy_file_range(struct file *file_in, loff_t pos_in, + struct file *file_out, loff_t pos_out, + size_t len, unsigned int flags) +{ + return ovl_copyfile(file_in, pos_in, file_out, pos_out, len, flags, + OVL_COPY); +} + +static int ovl_clone_file_range(struct file *file_in, loff_t pos_in, + struct file *file_out, loff_t pos_out, u64 len) +{ + return ovl_copyfile(file_in, pos_in, file_out, pos_out, len, 0, + OVL_CLONE); +} + +static loff_t ovl_dedupe_file_range(struct file *file_in, loff_t pos_in, + struct file *file_out, loff_t pos_out, + loff_t len) +{ + /* + * Don't copy up because of a dedupe request, this wouldn't make sense + * most of the time (data would be duplicated instead of deduplicated). + */ + if (!ovl_inode_upper(file_inode(file_in)) || + !ovl_inode_upper(file_inode(file_out))) + return -EPERM; + + return ovl_copyfile(file_in, pos_in, file_out, pos_out, len, 0, + OVL_DEDUPE); +} + const struct file_operations ovl_file_operations = { .open = ovl_open, .release = ovl_release, @@ -396,4 +480,8 @@ const struct file_operations ovl_file_operations = { .fallocate = ovl_fallocate, .unlocked_ioctl = ovl_ioctl, .compat_ioctl = ovl_compat_ioctl, + + .copy_file_range = ovl_copy_file_range, + .clone_file_range = ovl_clone_file_range, + .dedupe_file_range = ovl_dedupe_file_range, }; -- 2.14.3