Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755394AbZJUTVr (ORCPT ); Wed, 21 Oct 2009 15:21:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755355AbZJUTVn (ORCPT ); Wed, 21 Oct 2009 15:21:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28274 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755301AbZJUTVk (ORCPT ); Wed, 21 Oct 2009 15:21:40 -0400 From: Valerie Aurora To: Jan Blunck , Alexander Viro , Christoph Hellwig , Andy Whitcroft , Scott James Remnant , Sandu Popa Marius , Jan Rekorajski , "J. R. Okajima" , Arnd Bergmann , Vladimir Dronnikov , Felix Fietkau Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Felix Fietkau Subject: [PATCH 35/41] union-mount: Copy up directory entries on first readdir() Date: Wed, 21 Oct 2009 12:19:33 -0700 Message-Id: <1256152779-10054-36-git-send-email-vaurora@redhat.com> In-Reply-To: <1256152779-10054-35-git-send-email-vaurora@redhat.com> References: <1256152779-10054-1-git-send-email-vaurora@redhat.com> <1256152779-10054-2-git-send-email-vaurora@redhat.com> <1256152779-10054-3-git-send-email-vaurora@redhat.com> <1256152779-10054-4-git-send-email-vaurora@redhat.com> <1256152779-10054-5-git-send-email-vaurora@redhat.com> <1256152779-10054-6-git-send-email-vaurora@redhat.com> <1256152779-10054-7-git-send-email-vaurora@redhat.com> <1256152779-10054-8-git-send-email-vaurora@redhat.com> <1256152779-10054-9-git-send-email-vaurora@redhat.com> <1256152779-10054-10-git-send-email-vaurora@redhat.com> <1256152779-10054-11-git-send-email-vaurora@redhat.com> <1256152779-10054-12-git-send-email-vaurora@redhat.com> <1256152779-10054-13-git-send-email-vaurora@redhat.com> <1256152779-10054-14-git-send-email-vaurora@redhat.com> <1256152779-10054-15-git-send-email-vaurora@redhat.com> <1256152779-10054-16-git-send-email-vaurora@redhat.com> <1256152779-10054-17-git-send-email-vaurora@redhat.com> <1256152779-10054-18-git-send-email-vaurora@redhat.com> <1256152779-10054-19-git-send-email-vaurora@redhat.com> <1256152779-10054-20-git-send-email-vaurora@redhat.com> <1256152779-10054-21-git-send-email-vaurora@redhat.com> <1256152779-10054-22-git-send-email-vaurora@redhat.com> <1256152779-10054-23-git-send-email-vaurora@redhat.com> <1256152779-10054-24-git-send-email-vaurora@redhat.com> <1256152779-10054-25-git-send-email-vaurora@redhat.com> <1256152779-10054-26-git-send-email-vaurora@redhat.com> <1256152779-10054-27-git-send-email-vaurora@redhat.com> <1256152779-10054-28-git-send-email-vaurora@redhat.com> <1256152779-10054-29-git-send-email-vaurora@redhat.com> <1256152779-10054-30-git-send-email-vaurora@redhat.com> <1256152779-10054-31-git-send-email-vaurora@redhat.com> <1256152779-10054-32-git-send-email-vaurora@redhat.com> <1256152779-10054-33-git-send-email-vaurora@redhat.com> <1256152779-10054-34-git-send-email-vaurora@redhat.com> <1256152779-10054-35-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: 8398 Lines: 270 readdir() in union mounts is implemented by copying up all visible directory entries from the lower level directories to the topmost directory. Directory entries that refer to lower level file system objects are marked as "fallthru" in the topmost directory. Thanks to Felix Fietkau for a bug fix. XXX - Do we need i_mutex on lower layer? XXX - Rewrite for two layers only? Signed-off-by: Valerie Aurora Signed-off-by: Felix Fietkau --- fs/readdir.c | 17 +++++ fs/union.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/union.h | 2 + 3 files changed, 190 insertions(+), 0 deletions(-) diff --git a/fs/readdir.c b/fs/readdir.c index 3a48491..cfeacd8 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include @@ -36,9 +38,24 @@ int vfs_readdir(struct file *file, filldir_t filler, void *buf) res = -ENOENT; if (!IS_DEADDIR(inode)) { + /* + * XXX Think harder about locking for + * union_copyup_dir. Currently we lock the topmost + * directory and hold that lock while sequentially + * acquiring and dropping locks for the directories + * below this one in the union stack. + */ + if (is_unionized(file->f_path.dentry, file->f_path.mnt) && + !IS_OPAQUE(inode) && IS_MNT_UNION(file->f_path.mnt)) { + res = union_copyup_dir(&file->f_path); + if (res) + goto out_unlock; + } + res = file->f_op->readdir(file, buf, filler); file_accessed(file); } +out_unlock: mutex_unlock(&inode->i_mutex); out: return res; diff --git a/fs/union.c b/fs/union.c index de31fc9..d56b829 100644 --- a/fs/union.c +++ b/fs/union.c @@ -5,6 +5,7 @@ * Copyright (C) 2007-2009 Novell Inc. * * Author(s): Jan Blunck (j.blunck@tu-harburg.de) + * Valerie Aurora * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free @@ -777,3 +778,173 @@ void detach_mnt_union(struct vfsmount *mnt) union_put(um); return; } + +/** + * union_copyup_dir_one - copy up a single directory entry + * + * Individual directory entry copyup function for union_copyup_dir. + * We get the entries from higher level layers first. + */ + +static int union_copyup_dir_one(void *buf, const char *name, int namlen, + loff_t offset, u64 ino, unsigned int d_type) +{ + struct dentry *topmost_dentry = (struct dentry *) buf; + struct dentry *dentry; + int err = 0; + + switch (namlen) { + case 2: + if (name[1] != '.') + break; + case 1: + if (name[0] != '.') + break; + return 0; + } + + /* Lookup this entry in the topmost directory */ + dentry = lookup_one_len(name, topmost_dentry, namlen); + + if (IS_ERR(dentry)) { + printk(KERN_INFO "error looking up %s\n", dentry->d_name.name); + goto out; + } + + /* + * If the entry already exists, one of the following is true: + * it was already copied up (due to an earlier lookup), an + * entry with the same name already exists on the topmost file + * system, it is a whiteout, or it is a fallthru. In each + * case, the top level entry masks any entries from lower file + * systems, so don't copy up this entry. + */ + if (dentry->d_inode || d_is_whiteout(dentry) || + d_is_fallthru(dentry)) { + printk(KERN_INFO "skipping copy of %s\n", dentry->d_name.name); + goto out_dput; + } + + /* + * If the entry doesn't exist, create a fallthru entry in the + * topmost file system. All possible directory types are + * used, so each file system must implement its own way of + * storing a fallthru entry. + */ + printk(KERN_INFO "creating fallthru for %s\n", dentry->d_name.name); + err = topmost_dentry->d_inode->i_op->fallthru(topmost_dentry->d_inode, + dentry); + /* FIXME */ + BUG_ON(err); + /* + * At this point, we have a negative dentry marked as fallthru + * in the cache. We could potentially lookup the entry lower + * level file system and turn this into a positive dentry + * right now, but it is not clear that would be a performance + * win and adds more opportunities to fail. + */ +out_dput: + dput(dentry); +out: + return 0; +} + +/** + * union_copyup_dir - copy up low-level directory entries to topmost dir + * + * readdir() is difficult to support on union file systems for two + * reasons: We must eliminate duplicates and apply whiteouts, and we + * must return something in f_pos that lets us restart in the same + * place when we return. Our solution is to, on first readdir() of + * the directory, copy up all visible entries from the low-level file + * systems and mark the entries that refer to low-level file system + * objects as "fallthru" entries. + */ + +int union_copyup_dir(struct path *topmost_path) +{ + struct dentry *topmost_dentry = topmost_path->dentry; + struct path path = *topmost_path; + int res = 0; + + /* + * Skip opaque dirs. + */ + if (IS_OPAQUE(topmost_dentry->d_inode)) + return 0; + + res = mnt_want_write(topmost_path->mnt); + if (res) + return res; + + /* + * Mark this dir opaque to show that we have already copied up + * the lower entries. Only fallthru entries pass through to + * the underlying file system. + * + * XXX Deal with the lower file system changing. This could + * be through running a tool over the top level file system to + * make directories transparent again, or we could check the + * mtime of the underlying directory. + */ + + topmost_dentry->d_inode->i_flags |= S_OPAQUE; + mark_inode_dirty(topmost_dentry->d_inode); + + /* + * Loop through each dir on each level copying up the entries + * to the topmost. + */ + + /* Don't drop the caller's reference to the topmost path */ + path_get(&path); + while (follow_union_down(&path.mnt, &path.dentry)) { + struct file * ftmp; + struct inode * inode; + + /* XXX Permit fallthrus on lower-level? Would need to + * pass in opaque flag to union_copyup_dir_one() and + * only copy up fallthru entries there. We allow + * fallthrus in lower level opaque directories on + * lookup, so for consistency we should do one or the + * other in both places. */ + if (IS_OPAQUE(path.dentry->d_inode)) + break; + + /* dentry_open() doesn't get a path reference itself */ + path_get(&path); + ftmp = dentry_open(path.dentry, path.mnt, + O_RDONLY | O_DIRECTORY | O_NOATIME, + current_cred()); + if (IS_ERR(ftmp)) { + printk (KERN_ERR "unable to open dir %s for " + "directory copyup: %ld\n", + path.dentry->d_name.name, PTR_ERR(ftmp)); + continue; + } + + inode = path.dentry->d_inode; + mutex_lock(&inode->i_mutex); + + res = -ENOENT; + if (IS_DEADDIR(inode)) + goto out_fput; + /* + * Read the whole directory, calling our directory + * entry copyup function on each entry. Pass in the + * topmost dentry as our private data so we can create + * new entries in the topmost directory. + */ + res = ftmp->f_op->readdir(ftmp, topmost_dentry, + union_copyup_dir_one); +out_fput: + mutex_unlock(&inode->i_mutex); + fput(ftmp); + + if (res) + break; + } + path_put(&path); + mnt_drop_write(topmost_path->mnt); + return res; +} diff --git a/include/linux/union.h b/include/linux/union.h index 405baa9..a0656b3 100644 --- a/include/linux/union.h +++ b/include/linux/union.h @@ -57,6 +57,7 @@ extern struct dentry *union_create_topmost(struct nameidata *, struct qstr *, struct path *); extern int __union_copyup(struct path *, struct nameidata *, struct path *); extern int union_copyup(struct nameidata *, int); +extern int union_copyup_dir(struct path *path); #else /* CONFIG_UNION_MOUNT */ @@ -74,6 +75,7 @@ extern int union_copyup(struct nameidata *, int); #define union_create_topmost(x, y, z) ({ BUG(); (NULL); }) #define __union_copyup(x, y, z) ({ BUG(); (0); }) #define union_copyup(x, y) ({ (0); }) +#define union_copyup_dir(x) ({ BUG(); (0); }) #endif /* CONFIG_UNION_MOUNT */ #endif /* __KERNEL__ */ -- 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/