From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758545Ab0FOSpV (ORCPT ); Tue, 15 Jun 2010 14:45:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50496 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758472Ab0FOSmX (ORCPT ); Tue, 15 Jun 2010 14:42:23 -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 23/38] union-mount: Call do_whiteout() on unlink and rmdir in unions Date: Tue, 15 Jun 2010 11:39:53 -0700 Message-Id: <1276627208-17242-24-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 Call do_whiteout() when removing files and directories from a union mounted file system. Signed-off-by: Valerie Aurora --- fs/namei.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 45be5e5..1e6adf7 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2592,6 +2592,10 @@ static long do_rmdir(int dfd, const char __user *pathname) error = security_path_rmdir(&nd.path, path.dentry); if (error) goto exit4; + if (IS_DIR_UNIONED(nd.path.dentry)) { + error = do_whiteout(&nd, &path, 1); + goto exit4; + } error = vfs_rmdir(nd.path.dentry->d_inode, path.dentry); exit4: mnt_drop_write(nd.path.mnt); @@ -2681,6 +2685,10 @@ static long do_unlinkat(int dfd, const char __user *pathname) error = security_path_unlink(&nd.path, path.dentry); if (error) goto exit3; + if (IS_DIR_UNIONED(nd.path.dentry)) { + error = do_whiteout(&nd, &path, 0); + goto exit3; + } error = vfs_unlink(nd.path.dentry->d_inode, path.dentry); exit3: mnt_drop_write(nd.path.mnt); -- 1.6.3.3