mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Josef Sipek <jsipek@cs.sunysb.edu>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, hch@infradead.org, akpm@osdl.org,
	viro@ftp.linux.org.uk
Subject: [PATCH 17/22][RFC] Unionfs: Miscellaneous helper functions
Date: Thu, 31 Aug 2006 21:58:10 -0400	[thread overview]
Message-ID: <20060901015810.GR5788@fsl.cs.sunysb.edu> (raw)
In-Reply-To: <20060901013512.GA5788@fsl.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 |  179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)

diff -Nur -x linux-2.6-git/Documentation/dontdiff linux-2.6-git/fs/unionfs/subr.c linux-2.6-git-unionfs/fs/unionfs/subr.c
--- linux-2.6-git/fs/unionfs/subr.c	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6-git-unionfs/fs/unionfs/subr.c	2006-08-31 19:04:01.000000000 -0400
@@ -0,0 +1,179 @@
+/*
+ * 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
+ *
+ * For specific licensing information, see the COPYING file distributed with
+ * this package.
+ *
+ * This Copyright notice must be kept intact and distributed with all sources.
+ */
+
+#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 = dtohd_index(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)
+			break;
+
+		if (!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 = dtohd_index(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;
+	}
+
+	if (dtohd_index(dentry, bindex))
+		dput(dtohd_index(dentry, bindex));
+	if (itohi_index(dentry->d_inode, bindex)) {
+		iput(itohi_index(dentry->d_inode, bindex));
+		set_itohi_index(dentry->d_inode, bindex, NULL);
+	}
+	if (!hidden_dentry->d_inode) {
+		dput(hidden_dentry);
+		set_dtohd_index(dentry, bindex, NULL);
+	} else {
+		set_dtohd_index(dentry, bindex, hidden_dentry);
+		set_itohi_index(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 = dtohd_index(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;
+}
+

  parent reply	other threads:[~2006-09-01  1:58 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-09-01  1:35 [PATCH 00/22][RFC] Unionfs: Stackable Namespace Unification Filesystem Josef Sipek
2006-09-01  1:37 ` [PATCH 01/22][RFC] Unionfs: Documentation Josef Sipek
2006-09-01  7:42   ` Jan Engelhardt
2006-09-01  1:39 ` [PATCH 02/22][RFC] Unionfs: Kconfig and Makefile Josef Sipek
2006-09-01 12:44   ` Jan Engelhardt
2006-09-01 15:32     ` Randy.Dunlap
2006-09-01  1:40 ` [PATCH 03/22][RFC] Unionfs: Branch management functionality Josef Sipek
2006-09-04 11:20   ` Pekka Enberg
2006-09-01  1:41 ` [PATCH 04/22][RFC] Unionfs: Common file operations Josef Sipek
2006-09-01 12:50   ` Jan Engelhardt
2006-09-01 22:20   ` Trond Myklebust
2006-09-01 22:36     ` Shaya Potter
2006-09-01 22:57       ` Trond Myklebust
2006-09-03  1:03         ` Shaya Potter
2006-09-02  2:47     ` Josef Sipek
2006-09-03  4:10       ` Trond Myklebust
2006-09-01  1:42 ` [PATCH 05/22][RFC] Unionfs: Copyup Functionality Josef Sipek
2006-09-04  6:59   ` Jan Engelhardt
2006-09-04  9:25     ` Josef Sipek
2006-09-04 10:41       ` Jan Engelhardt
2006-09-16 22:13         ` Josef Sipek
2006-09-16 22:26           ` Jan Engelhardt
2006-09-17  1:28           ` Shaya Potter
2006-09-01  1:44 ` [PATCH 06/22][RFC] Unionfs: Dentry operations Josef Sipek
2006-09-04  7:04   ` Jan Engelhardt
2006-09-01  1:45 ` [PATCH 07/22][RFC] Unionfs: Directory file operations Josef Sipek
2006-09-04  7:07   ` Jan Engelhardt
2006-09-01  1:47 ` [PATCH 08/22][RFC] Unionfs: Directory manipulation helper functions Josef Sipek
2006-09-04  7:09   ` Jan Engelhardt
2006-09-04  7:23     ` Jeremy Fitzhardinge
2006-09-01  1:48 ` [PATCH 09/22][RFC] Unionfs: File operations Josef Sipek
2006-09-01  3:02   ` Ian Kent
2006-09-04  7:11   ` Jan Engelhardt
2006-09-01  1:49 ` [PATCH 10/22][RFC] Unionfs: Inode operations Josef Sipek
2006-09-04  7:18   ` Jan Engelhardt
2006-09-01  1:50 ` [PATCH 11/22][RFC] Unionfs: Lookup helper functions Josef Sipek
2006-09-04  7:24   ` Jan Engelhardt
2006-09-01  1:51 ` [PATCH 12/22][RFC] Unionfs: Main module functions Josef Sipek
2006-09-04  7:28   ` Jan Engelhardt
2006-09-01  1:53 ` [PATCH 00/22][RFC] Unionfs: Stackable Namespace Unification Filesystem Stephen Rothwell
2006-09-01 17:23   ` Josef Sipek
2006-09-03 17:42     ` Jan Engelhardt
2006-09-03 19:44       ` Josef Sipek
2006-09-04 11:01         ` Pekka Enberg
2006-09-04 23:34           ` Josef Sipek
2006-09-01  1:53 ` [PATCH 13/22][RFC] Unionfs: Readdir state Josef Sipek
2006-09-04  7:30   ` Jan Engelhardt
2006-09-01  1:54 ` [PATCH 14/22][RFC] Unionfs: Rename Josef Sipek
2006-09-01  1:55 ` [PATCH 15/22][RFC] Unionfs: Privileged operations workqueue Josef Sipek
2006-09-04  7:37   ` Jan Engelhardt
2006-09-01  1:56 ` [PATCH 16/22][RFC] Unionfs: Handling of stale inodes Josef Sipek
2006-09-04  7:39   ` Jan Engelhardt
2006-09-01  1:58 ` Josef Sipek [this message]
2006-09-01  1:58 ` [PATCH 18/22][RFC] Unionfs: Superblock operations Josef Sipek
2006-09-04  7:46   ` Jan Engelhardt
2006-09-04  8:24     ` Andreas Schwab
2006-09-01  1:59 ` [PATCH 19/22][RFC] Unionfs: Helper macros/inlines Josef Sipek
2006-09-04  7:49   ` Jan Engelhardt
2006-09-01  2:01 ` [PATCH 20/22][RFC] Unionfs: Internal include file Josef Sipek
2006-09-04  7:54   ` Jan Engelhardt
2006-09-01  2:01 ` [PATCH 21/22][RFC] Unionfs: Unlink Josef Sipek
2006-09-01  2:02 ` [PATCH 22/22][RFC] Unionfs: Include file Josef Sipek
2006-09-04  7:55   ` Jan Engelhardt
2006-09-03 11:05 ` [PATCH 00/22][RFC] Unionfs: Stackable Namespace Unification Filesystem Pavel Machek
2006-09-04 12:57   ` Jörn Engel
2006-09-05  4:46     ` Al Boldi
2006-09-05  7:01       ` Jörn Engel
2006-09-04 13:28   ` Shaya Potter
2006-09-04 20:33     ` Pavel Machek
2006-09-04 21:43       ` Shaya Potter
2006-09-04 23:31         ` Josef Sipek
2006-09-05  6:02         ` Jan Engelhardt
2006-09-05 13:02           ` Shaya Potter
2006-09-05  3:08     ` Trond Myklebust
2006-09-05  3:28       ` Shaya Potter

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=20060901015810.GR5788@fsl.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=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

all inboxes | Powered by JetHome®