From mboxrd@z Thu Jan 1 00:00:00 1970 From: Amir Goldstein Subject: Re: [PATCH 2/7] ovl: During copy up, first copy up metadata and then data Date: Mon, 2 Oct 2017 22:13:24 +0300 Message-ID: References: <1506951605-31440-1-git-send-email-vgoyal@redhat.com> <1506951605-31440-3-git-send-email-vgoyal@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: Received: from mail-qt0-f194.google.com ([209.85.216.194]:38112 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751106AbdJBTNZ (ORCPT ); Mon, 2 Oct 2017 15:13:25 -0400 Received: by mail-qt0-f194.google.com with SMTP id o3so177663qte.5 for ; Mon, 02 Oct 2017 12:13:25 -0700 (PDT) In-Reply-To: <1506951605-31440-3-git-send-email-vgoyal@redhat.com> Sender: linux-unionfs-owner@vger.kernel.org List-Id: linux-unionfs@vger.kernel.org To: Vivek Goyal Cc: overlayfs , Miklos Szeredi On Mon, Oct 2, 2017 at 4:40 PM, Vivek Goyal wrote: > This just helps with later patches where after copying up metadata, we > skip data copying step, if needed. > > Signed-off-by: Vivek Goyal > --- > fs/overlayfs/copy_up.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c > index f1b15e5c37d3..cdc4d79a1249 100644 > --- a/fs/overlayfs/copy_up.c > +++ b/fs/overlayfs/copy_up.c > @@ -445,18 +445,6 @@ static int ovl_copy_up_inode(struct ovl_copy_up_ctx *c, struct dentry *temp) > { > int err; > > - if (S_ISREG(c->stat.mode)) { > - struct path upperpath; > - > - ovl_path_upper(c->dentry, &upperpath); > - BUG_ON(upperpath.dentry != NULL); > - upperpath.dentry = temp; > - > - err = ovl_copy_up_data(&c->lowerpath, &upperpath, c->stat.size); > - if (err) > - return err; > - } > - > err = ovl_copy_xattr(c->lowerpath.dentry, temp); > if (err) > return err; > @@ -480,6 +468,18 @@ static int ovl_copy_up_inode(struct ovl_copy_up_ctx *c, struct dentry *temp) > return err; > } > > + if (S_ISREG(c->stat.mode)) { > + struct path upperpath; > + > + ovl_path_upper(c->dentry, &upperpath); > + BUG_ON(upperpath.dentry != NULL); > + upperpath.dentry = temp; > + > + err = ovl_copy_up_data(&c->lowerpath, &upperpath, c->stat.size); > + if (err) > + return err; > + } > + You moved copy_up_data to after ovl_set_attr() -> ovl_set_timestamps() Does this break the copied up mtime? I'm not sure. I didn't see that do_splice_direct() or vfs_clone_file_range() change mtime directly, but inside file system, they might. > return 0; > } > > -- > 2.13.5 >