From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758320Ab0FOSlk (ORCPT ); Tue, 15 Jun 2010 14:41:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34337 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758305Ab0FOSli (ORCPT ); Tue, 15 Jun 2010 14:41:38 -0400 From: Valerie Aurora To: Alexander Viro Cc: Miklos Szeredi , Jan Blunck , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Valerie Aurora Subject: [PATCH 07/38] whiteout: Set S_OPAQUE inode flag when creating directories Date: Tue, 15 Jun 2010 11:39:37 -0700 Message-Id: <1276627208-17242-8-git-send-email-vaurora@redhat.com> In-Reply-To: <1276627208-17242-1-git-send-email-vaurora@redhat.com> References: <1276627208-17242-1-git-send-email-vaurora@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jan Blunck In case of an union directory we don't want that the directories on lower layers of the union "show through". So to prevent that the contents of underlying directories magically shows up after a mkdir() we set the S_OPAQUE flag if directories are created where a whiteout existed before. Signed-off-by: Jan Blunck Signed-off-by: Valerie Aurora --- fs/namei.c | 11 ++++++++++- include/linux/fs.h | 3 +++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 2c723e2..8c67636 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2107,6 +2107,7 @@ SYSCALL_DEFINE3(mknod, const char __user *, filename, int, mode, unsigned, dev) int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) { int error = may_create(dir, dentry); + int opaque = 0; if (error) return error; @@ -2119,9 +2120,17 @@ int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) if (error) return error; + if (d_is_whiteout(dentry)) + opaque = 1; + error = dir->i_op->mkdir(dir, dentry, mode); - if (!error) + if (!error) { fsnotify_mkdir(dir, dentry); + if (opaque) { + dentry->d_inode->i_flags |= S_OPAQUE; + mark_inode_dirty(dentry->d_inode); + } + } return error; } diff --git a/include/linux/fs.h b/include/linux/fs.h index 7afdbd4..e9aa650 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -236,6 +236,7 @@ struct inodes_stat_t { #define S_NOCMTIME 128 /* Do not update file c/mtime */ #define S_SWAPFILE 256 /* Do not truncate: swapon got its bmaps */ #define S_PRIVATE 512 /* Inode is fs-internal */ +#define S_OPAQUE 1024 /* Directory is opaque */ /* * Note that nosuid etc flags are inode-specific: setting some file-system @@ -271,6 +272,8 @@ struct inodes_stat_t { #define IS_SWAPFILE(inode) ((inode)->i_flags & S_SWAPFILE) #define IS_PRIVATE(inode) ((inode)->i_flags & S_PRIVATE) +#define IS_OPAQUE(inode) ((inode)->i_flags & S_OPAQUE) + /* the read-only stuff doesn't really belong here, but any other place is probably as bad and I don't want to create yet another include file. */ -- 1.6.3.3