Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932338Ab0FYTGQ (ORCPT ); Fri, 25 Jun 2010 15:06:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3724 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932240Ab0FYTGH (ORCPT ); Fri, 25 Jun 2010 15:06:07 -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 08/38] whiteout: Allow removal of a directory with whiteouts Date: Fri, 25 Jun 2010 12:04:58 -0700 Message-Id: <1277492728-11446-9-git-send-email-vaurora@redhat.com> In-Reply-To: <1277492728-11446-1-git-send-email-vaurora@redhat.com> References: <1277492728-11446-1-git-send-email-vaurora@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3093 Lines: 125 From: Jan Blunck do_whiteout() allows removal of a directory when it has whiteouts but is logically empty. XXX - This patch abuses readdir() to check if the union directory is logically empty - that is, all the entries are whiteouts (or "." or ".."). Currently, we have no clean VFS interface to ask the lower file system if a directory is empty. Fixes: - Add ->is_directory_empty() op - Add is_directory_empty flag to dentry (ugly dcache populate) - Ask underlying fs to remove it and look for an error return - (your idea here) Signed-off-by: Jan Blunck Signed-off-by: Valerie Aurora --- fs/namei.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 8c67636..06aad7e 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2249,6 +2249,90 @@ static int vfs_whiteout(struct inode *dir, struct dentry *old_dentry, int isdir) } /* + * XXX - We are abusing readdir to check if a union directory is + * logically empty. + */ +static int filldir_is_empty(void *__buf, const char *name, int namlen, + loff_t offset, u64 ino, unsigned int d_type) +{ + int *is_empty = (int *)__buf; + + switch (namlen) { + case 2: + if (name[1] != '.') + break; + case 1: + if (name[0] != '.') + break; + return 0; + } + + if (d_type == DT_WHT) + return 0; + + (*is_empty) = 0; + return 0; +} + +static int directory_is_empty(struct path *path) +{ + struct file *file; + int err; + int is_empty = 1; + + BUG_ON(!S_ISDIR(path->dentry->d_inode->i_mode)); + + /* references for the file pointer */ + path_get(path); + + file = dentry_open(path->dentry, path->mnt, O_RDONLY, current_cred()); + if (IS_ERR(file)) + return 0; + + err = vfs_readdir(file, filldir_is_empty, &is_empty); + + fput(file); + return is_empty; +} + +static int do_whiteout(struct nameidata *nd, struct path *path, int isdir) +{ + struct path safe = nd->path; + struct dentry *dentry = path->dentry; + int err; + + path_get(&safe); + + err = may_delete(nd->path.dentry->d_inode, dentry, isdir); + if (err) + goto out; + + err = -ENOTEMPTY; + if (isdir && !directory_is_empty(path)) + goto out; + + if (nd->path.dentry != dentry->d_parent) { + dentry = __lookup_hash(&path->dentry->d_name, nd->path.dentry, + nd); + err = PTR_ERR(dentry); + if (IS_ERR(dentry)) + goto out; + + dput(path->dentry); + if (path->mnt != safe.mnt) + mntput(path->mnt); + path->mnt = nd->path.mnt; + path->dentry = dentry; + } + + err = vfs_whiteout(nd->path.dentry->d_inode, dentry, isdir); + +out: + path_put(&safe); + return err; +} + +/* * We try to drop the dentry early: we should have * a usage count of 2 if we're the only user of this * dentry, and if that is true (possibly after pruning -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/