From patchwork Mon May 1 13:41:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9706609 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 C3FC360385 for ; Mon, 1 May 2017 13:42:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4625205A8 for ; Mon, 1 May 2017 13:42:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A64682097A; Mon, 1 May 2017 13:42:06 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 44F1D2808C for ; Mon, 1 May 2017 13:42:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1166046AbdEANmE (ORCPT ); Mon, 1 May 2017 09:42:04 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:36254 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1035855AbdEANmA (ORCPT ); Mon, 1 May 2017 09:42:00 -0400 Received: by mail-wr0-f193.google.com with SMTP id v42so13804521wrc.3; Mon, 01 May 2017 06:41:59 -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=MxrEweSgZuC+aeQKAevBCnx4Ngo7jlB7CrMSXDX+OJ8=; b=YeKTd0AJ7fmFPkw96xuHXaHVCYX+Fl9LNyRdQT8NzpfYAVSaOpFuD0QBUu4a5WfL5o xwR9tBGzneIGzN13MBoqy1WTqg4veOL2ttiQqWGtC2YioX/sFJ+2bamPH0NUiNrgDdYQ WRJZi6RKOwdV5YvXkaXqUQtNW6Yzf6TzLn5DYUub3AfW5EbGNtMIZ2qXpnchSW6UvNwv GCB4vCI77sKsR0GfljyqM3La3gE9RTQ5rDdLzyPBGCyrJxhh84Pgfrb1ELu+oVkTo4tA VRZDAQCwEt0JOAl+DShExexupPb8XxVMdC0fZw5XffAJhKZukDCiu+nnGQg1t75XzzcD nm+Q== 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=MxrEweSgZuC+aeQKAevBCnx4Ngo7jlB7CrMSXDX+OJ8=; b=tm43aRAtj2vSF6z2oeWC/6UD7dnJHEdQU42gQGH5iKKWGS3UNTcTGBGeILl+6onq+Q hKetaUTlfSeTJfelCJ/fAHnWGhNPQ18uwMhpt/G5b3/phxNgAtubnwoo26bGqecSPEFO QH3c99ydkgGIBvou+VLOby0H08HCilTSI/ORTlhHart+NxWwABvczICu7nsMUHymAov4 pYPFF8vN0OwXPwrRp+Dp46TVil1KQxvYBaceTKOe/f1HtRzKQ+QNnAhTmcmsHT830eFk ynXQ+ffBCouKrjSEdppH6iIaiT/DZQt/dwR94qVtlvxFSgrcMGSFbFid6QK7rf6fGXvI 8N4A== X-Gm-Message-State: AN3rC/7NT3TltdtfJNMYo8+kMrwi4dbKoT6JnTfpL4ASuBIsMUzxKnO/ C0QTi0oifPUXwpVZ X-Received: by 10.223.165.138 with SMTP id g10mr18527143wrc.19.1493646118882; Mon, 01 May 2017 06:41:58 -0700 (PDT) Received: from amir-VirtualBox.lan (bzq-79-179-55-127.red.bezeqint.net. [79.179.55.127]) by smtp.gmail.com with ESMTPSA id l82sm12532249wmf.17.2017.05.01.06.41.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 May 2017 06:41:58 -0700 (PDT) From: Amir Goldstein To: Miklos Szeredi Cc: Vivek Goyal , Al Viro , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v4 01/15] ovl: check if all layers are on the same fs Date: Mon, 1 May 2017 16:41:52 +0300 Message-Id: <1493646126-10101-2-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493646126-10101-1-git-send-email-amir73il@gmail.com> References: <1493646126-10101-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 Some features can only work when all lower layers are on the same fs and some features require that upper layer is also on the same fs. Test those conditions during mount time, so features can check them later. Add helper ovl_same_lower_sb() to return the common super block in case all lower layers are on the same fs and helper ovl_same_sb() to return the super block common to all layers. Signed-off-by: Amir Goldstein --- fs/overlayfs/overlayfs.h | 2 ++ fs/overlayfs/ovl_entry.h | 3 +++ fs/overlayfs/super.c | 9 +++++++++ fs/overlayfs/util.c | 14 ++++++++++++++ 4 files changed, 28 insertions(+) diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h index 741dc0b..2ddbd44 100644 --- a/fs/overlayfs/overlayfs.h +++ b/fs/overlayfs/overlayfs.h @@ -151,6 +151,8 @@ int ovl_want_write(struct dentry *dentry); void ovl_drop_write(struct dentry *dentry); struct dentry *ovl_workdir(struct dentry *dentry); const struct cred *ovl_override_creds(struct super_block *sb); +struct super_block *ovl_same_lower_sb(struct super_block *sb); +struct super_block *ovl_same_sb(struct super_block *sb); struct ovl_entry *ovl_alloc_entry(unsigned int numlower); bool ovl_dentry_remote(struct dentry *dentry); bool ovl_dentry_weird(struct dentry *dentry); diff --git a/fs/overlayfs/ovl_entry.h b/fs/overlayfs/ovl_entry.h index 59614fa..68fa932 100644 --- a/fs/overlayfs/ovl_entry.h +++ b/fs/overlayfs/ovl_entry.h @@ -29,6 +29,9 @@ struct ovl_fs { const struct cred *creator_cred; bool tmpfile; wait_queue_head_t copyup_wq; + /* sb common to all (or all lower) layers */ + struct super_block *same_lower_sb; + struct super_block *same_sb; }; /* private information held for every overlayfs dentry */ diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index c072a0c..7d56aa8 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -898,6 +898,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) ufs->lower_mnt = kcalloc(numlower, sizeof(struct vfsmount *), GFP_KERNEL); if (ufs->lower_mnt == NULL) goto out_put_workdir; + for (i = 0; i < numlower; i++) { struct vfsmount *mnt = clone_private_mount(&stack[i]); @@ -914,11 +915,19 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) ufs->lower_mnt[ufs->numlower] = mnt; ufs->numlower++; + + /* Check if all lower layers are on same sb */ + if (i == 0) + ufs->same_lower_sb = mnt->mnt_sb; + else if (ufs->same_lower_sb != mnt->mnt_sb) + ufs->same_lower_sb = NULL; } /* If the upper fs is nonexistent, we mark overlayfs r/o too */ if (!ufs->upper_mnt) sb->s_flags |= MS_RDONLY; + else if (ufs->upper_mnt->mnt_sb == ufs->same_lower_sb) + ufs->same_sb = ufs->same_lower_sb; if (remote) sb->s_d_op = &ovl_reval_dentry_operations; diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index 8a1e24a..a474ab9 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -41,6 +41,20 @@ const struct cred *ovl_override_creds(struct super_block *sb) return override_creds(ofs->creator_cred); } +struct super_block *ovl_same_lower_sb(struct super_block *sb) +{ + struct ovl_fs *ofs = sb->s_fs_info; + + return ofs->same_lower_sb; +} + +struct super_block *ovl_same_sb(struct super_block *sb) +{ + struct ovl_fs *ofs = sb->s_fs_info; + + return ofs->same_sb; +} + struct ovl_entry *ovl_alloc_entry(unsigned int numlower) { size_t size = offsetof(struct ovl_entry, lowerstack[numlower]);