From: "Josef 'Jeff' Sipek" <jsipek@cs.sunysb.edu>
To: linux-kernel@vger.kernel.org
Cc: torvalds@osdl.org, akpm@osdl.org, hch@infradead.org,
viro@ftp.linux.org.uk, linux-fsdevel@vger.kernel.org,
mhalcrow@us.ibm.com, Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
Subject: [PATCH 28/35] Unionfs: Miscellaneous helper functions
Date: Mon, 4 Dec 2006 07:31:01 -0500 [thread overview]
Message-ID: <11652354723615-git-send-email-jsipek@cs.sunysb.edu> (raw)
In-Reply-To: <1165235468365-git-send-email-jsipek@cs.sunysb.edu>
From: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
This patch contains miscellaneous helper functions used thoughout Unionfs.
Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
Signed-off-by: David Quigley <dquigley@fsl.cs.sunysb.edu>
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
---
fs/unionfs/subr.c | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 170 insertions(+), 0 deletions(-)
diff --git a/fs/unionfs/subr.c b/fs/unionfs/subr.c
new file mode 100644
index 0000000..f002f19
--- /dev/null
+++ b/fs/unionfs/subr.c
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2003-2006 Erez Zadok
+ * Copyright (c) 2003-2006 Charles P. Wright
+ * Copyright (c) 2005-2006 Josef 'Jeff' Sipek
+ * Copyright (c) 2005-2006 Junjiro Okajima
+ * Copyright (c) 2005 Arun M. Krishnakumar
+ * Copyright (c) 2004-2006 David P. Quigley
+ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair
+ * Copyright (c) 2003 Puja Gupta
+ * Copyright (c) 2003 Harikesavan Krishnan
+ * Copyright (c) 2003-2006 Stony Brook University
+ * Copyright (c) 2003-2006 The Research Foundation of State University of New York
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "union.h"
+
+/* Pass an unionfs dentry and an index. It will try to create a whiteout
+ * for the filename in dentry, and will try in branch 'index'. On error,
+ * it will proceed to a branch to the left.
+ */
+int create_whiteout(struct dentry *dentry, int start)
+{
+ int bstart, bend, bindex;
+ struct dentry *hidden_dir_dentry;
+ struct dentry *hidden_dentry;
+ struct dentry *hidden_wh_dentry;
+ char *name = NULL;
+ int err = -EINVAL;
+
+ verify_locked(dentry);
+
+ bstart = dbstart(dentry);
+ bend = dbend(dentry);
+
+ /* create dentry's whiteout equivalent */
+ name = alloc_whname(dentry->d_name.name, dentry->d_name.len);
+ if (IS_ERR(name)) {
+ err = PTR_ERR(name);
+ goto out;
+ }
+
+ for (bindex = start; bindex >= 0; bindex--) {
+ hidden_dentry = unionfs_lower_dentry_idx(dentry, bindex);
+
+ if (!hidden_dentry) {
+ /* if hidden dentry is not present, create the entire
+ * hidden dentry directory structure and go ahead.
+ * Since we want to just create whiteout, we only want
+ * the parent dentry, and hence get rid of this dentry.
+ */
+ hidden_dentry = create_parents(dentry->d_inode,
+ dentry, bindex);
+ if (!hidden_dentry || IS_ERR(hidden_dentry)) {
+ printk(KERN_DEBUG "create_parents failed for "
+ "bindex = %d\n", bindex);
+ continue;
+ }
+ }
+
+ hidden_wh_dentry = lookup_one_len(name, hidden_dentry->d_parent,
+ dentry->d_name.len + UNIONFS_WHLEN);
+ if (IS_ERR(hidden_wh_dentry))
+ continue;
+
+ /* The whiteout already exists. This used to be impossible, but
+ * now is possible because of opaqueness. */
+ if (hidden_wh_dentry->d_inode) {
+ dput(hidden_wh_dentry);
+ err = 0;
+ goto out;
+ }
+
+ hidden_dir_dentry = lock_parent(hidden_wh_dentry);
+ if (!(err = is_robranch_super(dentry->d_sb, bindex))) {
+ err = vfs_create(hidden_dir_dentry->d_inode,
+ hidden_wh_dentry,
+ ~current->fs->umask & S_IRWXUGO, NULL);
+
+ }
+ unlock_dir(hidden_dir_dentry);
+ dput(hidden_wh_dentry);
+
+ if (!err || !IS_COPYUP_ERR(err))
+ break;
+ }
+
+ /* set dbopaque so that lookup will not proceed after this branch */
+ if (!err)
+ set_dbopaque(dentry, bindex);
+
+out:
+ kfree(name);
+ return err;
+}
+
+/* This is a helper function for rename, which ends up with hosed over dentries
+ * when it needs to revert. */
+int unionfs_refresh_hidden_dentry(struct dentry *dentry, int bindex)
+{
+ struct dentry *hidden_dentry;
+ struct dentry *hidden_parent;
+ int err = 0;
+
+ verify_locked(dentry);
+
+ lock_dentry(dentry->d_parent);
+ hidden_parent = unionfs_lower_dentry_idx(dentry->d_parent, bindex);
+ unlock_dentry(dentry->d_parent);
+
+ BUG_ON(!S_ISDIR(hidden_parent->d_inode->i_mode));
+
+ hidden_dentry = lookup_one_len(dentry->d_name.name, hidden_parent,
+ dentry->d_name.len);
+ if (IS_ERR(hidden_dentry)) {
+ err = PTR_ERR(hidden_dentry);
+ goto out;
+ }
+
+ dput(unionfs_lower_dentry_idx(dentry, bindex));
+ iput(unionfs_lower_inode_idx(dentry->d_inode, bindex));
+ unionfs_set_lower_inode_idx(dentry->d_inode, bindex, NULL);
+
+ if (!hidden_dentry->d_inode) {
+ dput(hidden_dentry);
+ unionfs_set_lower_dentry_idx(dentry, bindex, NULL);
+ } else {
+ unionfs_set_lower_dentry_idx(dentry, bindex, hidden_dentry);
+ unionfs_set_lower_inode_idx(dentry->d_inode, bindex,
+ igrab(hidden_dentry->d_inode));
+ }
+
+out:
+ return err;
+}
+
+int make_dir_opaque(struct dentry *dentry, int bindex)
+{
+ int err = 0;
+ struct dentry *hidden_dentry, *diropq;
+ struct inode *hidden_dir;
+
+ hidden_dentry = unionfs_lower_dentry_idx(dentry, bindex);
+ hidden_dir = hidden_dentry->d_inode;
+ BUG_ON(!S_ISDIR(dentry->d_inode->i_mode) ||
+ !S_ISDIR(hidden_dir->i_mode));
+
+ mutex_lock(&hidden_dir->i_mutex);
+ diropq = lookup_one_len(UNIONFS_DIR_OPAQUE, hidden_dentry,
+ sizeof(UNIONFS_DIR_OPAQUE) - 1);
+ if (IS_ERR(diropq)) {
+ err = PTR_ERR(diropq);
+ goto out;
+ }
+
+ if (!diropq->d_inode)
+ err = vfs_create(hidden_dir, diropq, S_IRUGO, NULL);
+ if (!err)
+ set_dbopaque(dentry, bindex);
+
+ dput(diropq);
+
+out:
+ mutex_unlock(&hidden_dir->i_mutex);
+ return err;
+}
+
--
1.4.3.3
next prev parent reply other threads:[~2006-12-04 12:31 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-04 12:30 Unionfs: Stackable namespace unification filesystem Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 01/35] fsstack: Introduce fsstack_copy_{attr,inode}_* Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 02/35] fsstack: Remove unneeded wrapper Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 03/35] eCryptfs: Use fsstack's generic copy inode attr functions Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 04/35] fsstack: Fix up eCryptfs compilation Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 05/35] struct path: Rename Reiserfs's struct path Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 06/35] struct path: Rename DM's " Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 07/35] struct path: Move struct path from fs/namei.c into include/linux Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 08/35] struct path: make eCryptfs a user of struct path Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 09/35] fs/stack.c should #include <linux/fs_stack.h> Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 10/35] fsstack: Make fsstack_copy_attr_all copy inode size Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 11/35] fsstack: Fix up ecryptfs's fsstack usage Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 12/35] Unionfs: Documentation Josef 'Jeff' Sipek
2006-12-05 20:52 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 13/35] lookup_one_len_nd - lookup_one_len with nameidata argument Josef 'Jeff' Sipek
2006-12-05 20:53 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 14/35] Unionfs: Branch management functionality Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 15/35] Unionfs: Common file operations Josef 'Jeff' Sipek
2006-12-05 21:02 ` Jan Engelhardt
2006-12-08 4:16 ` Josef Sipek
2006-12-08 10:51 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 16/35] Unionfs: Copyup Functionality Josef 'Jeff' Sipek
2006-12-05 21:09 ` Jan Engelhardt
2006-12-08 4:43 ` Josef Sipek
2006-12-04 12:30 ` [PATCH 17/35] Unionfs: Dentry operations Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 18/35] Unionfs: File operations Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 19/35] Unionfs: Directory file operations Josef 'Jeff' Sipek
2006-12-05 21:17 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 20/35] Unionfs: Directory manipulation helper functions Josef 'Jeff' Sipek
2006-12-05 21:21 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 21/35] Unionfs: Inode operations Josef 'Jeff' Sipek
2006-12-05 21:27 ` Jan Engelhardt
2006-12-05 21:50 ` Andrew Morton
2006-12-05 21:53 ` David Miller
2006-12-06 4:12 ` Randy Dunlap
2006-12-07 14:04 ` Theodore Tso
2006-12-07 17:07 ` Andrew Morton
2006-12-07 22:42 ` Randy Dunlap
2006-12-04 12:30 ` [PATCH 22/35] Unionfs: Lookup helper functions Josef 'Jeff' Sipek
2006-12-05 21:29 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 23/35] Unionfs: Main module functions Josef 'Jeff' Sipek
2006-12-05 21:32 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 24/35] Unionfs: Readdir state Josef 'Jeff' Sipek
2006-12-05 21:40 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 25/35] Unionfs: Rename Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 26/35] Unionfs: Privileged operations workqueue Josef 'Jeff' Sipek
2006-12-05 19:27 ` Jan Engelhardt
2006-12-05 19:50 ` Josef Sipek
2006-12-06 17:32 ` Josef Sipek
2006-12-06 18:46 ` Jan Engelhardt
2006-12-08 2:17 ` Josef Sipek
2006-12-08 10:38 ` Jan Engelhardt
2006-12-08 16:00 ` Josef Sipek
2006-12-08 17:02 ` Jan Engelhardt
2006-12-08 17:43 ` Josef Sipek
2006-12-08 18:03 ` Jan Engelhardt
2006-12-08 18:24 ` Josef Sipek
2006-12-04 12:31 ` [PATCH 27/35] Unionfs: Handling of stale inodes Josef 'Jeff' Sipek
2006-12-04 12:31 ` Josef 'Jeff' Sipek [this message]
2006-12-04 12:31 ` [PATCH 29/35] Unionfs: Superblock operations Josef 'Jeff' Sipek
2006-12-07 10:59 ` Jan Engelhardt
2006-12-04 12:31 ` [PATCH 30/35] Unionfs: Helper macros/inlines Josef 'Jeff' Sipek
2006-12-07 11:00 ` Jan Engelhardt
2006-12-04 12:31 ` [PATCH 31/35] Unionfs: Internal include file Josef 'Jeff' Sipek
2006-12-05 19:41 ` Jan Engelhardt
2006-12-04 12:31 ` [PATCH 32/35] Unionfs: Include file Josef 'Jeff' Sipek
2006-12-07 11:01 ` Jan Engelhardt
2006-12-04 12:31 ` [PATCH 33/35] Unionfs: Unlink Josef 'Jeff' Sipek
2006-12-04 12:31 ` [PATCH 34/35] Unionfs: Kconfig and Makefile Josef 'Jeff' Sipek
2006-12-04 12:31 ` [PATCH 35/35] Unionfs: Extended Attributes support Josef 'Jeff' Sipek
2006-12-07 11:04 ` Jan Engelhardt
2006-12-08 5:35 ` Josef Sipek
2006-12-08 10:53 ` Jan Engelhardt
2006-12-05 15:13 ` Unionfs: Stackable namespace unification filesystem Josef Sipek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11652354723615-git-send-email-jsipek@cs.sunysb.edu \
--to=jsipek@cs.sunysb.edu \
--cc=akpm@osdl.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhalcrow@us.ibm.com \
--cc=torvalds@osdl.org \
--cc=viro@ftp.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).