linux-kernel.vger.kernel.org archive mirror
 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 08/22][RFC] Unionfs: Directory manipulation helper functions
Date: Thu, 31 Aug 2006 21:47:08 -0400	[thread overview]
Message-ID: <20060901014708.GI5788@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 directory manipulation helper functions.

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/dirhelper.c |  268 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 268 insertions(+)

diff -Nur -x linux-2.6-git/Documentation/dontdiff linux-2.6-git/fs/unionfs/dirhelper.c linux-2.6-git-unionfs/fs/unionfs/dirhelper.c
--- linux-2.6-git/fs/unionfs/dirhelper.c	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6-git-unionfs/fs/unionfs/dirhelper.c	2006-08-31 19:04:00.000000000 -0400
@@ -0,0 +1,268 @@
+/*
+ * 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"
+
+/* Delete all of the whiteouts in a given directory for rmdir. */
+int do_delete_whiteouts(struct dentry *dentry, int bindex,
+		     struct unionfs_dir_state *namelist)
+{
+	int err = 0;
+	struct dentry *hidden_dir_dentry = NULL;
+	struct dentry *hidden_dentry;
+	char *name = NULL, *p;
+	struct inode *hidden_dir;
+
+	int i;
+	struct list_head *pos;
+	struct filldir_node *cursor;
+
+	/* Find out hidden parent dentry */
+	hidden_dir_dentry = dtohd_index(dentry, bindex);
+	BUG_ON(!S_ISDIR(hidden_dir_dentry->d_inode->i_mode));
+	hidden_dir = hidden_dir_dentry->d_inode;
+	BUG_ON(!S_ISDIR(hidden_dir->i_mode));
+
+	err = -ENOMEM;
+	name = __getname();
+	if (!name)
+		goto out;
+	strcpy(name, UNIONFS_WHPFX);
+	p = name + UNIONFS_WHLEN;
+
+	err = 0;
+	for (i = 0; !err && i < namelist->uds_size; i++) {
+		list_for_each(pos, &namelist->uds_list[i]) {
+			cursor =
+			    list_entry(pos, struct filldir_node, file_list);
+			/* Only operate on whiteouts in this branch. */
+			if (cursor->bindex != bindex)
+				continue;
+			if (!cursor->whiteout)
+				continue;
+
+			strcpy(p, cursor->name);
+			hidden_dentry =
+			    lookup_one_len(name, hidden_dir_dentry,
+					   cursor->namelen + UNIONFS_WHLEN);
+			if (IS_ERR(hidden_dentry)) {
+				err = PTR_ERR(hidden_dentry);
+				break;
+			}
+			if (hidden_dentry->d_inode)
+				err = vfs_unlink(hidden_dir, hidden_dentry);
+			dput(hidden_dentry);
+			if (err)
+				break;
+		}
+	}
+
+	__putname(name);
+
+	/* After all of the removals, we should copy the attributes once. */
+	fist_copy_attr_times(dentry->d_inode, hidden_dir_dentry->d_inode);
+
+out:
+	return err;
+}
+
+int delete_whiteouts(struct dentry *dentry, int bindex,
+		     struct unionfs_dir_state *namelist)
+{
+	int err;
+	struct super_block *sb;
+	struct dentry *hidden_dir_dentry;
+	struct inode *hidden_dir;
+
+	struct sioq_args args;
+
+	sb = dentry->d_sb;
+	unionfs_read_lock(sb);
+
+	BUG_ON(!S_ISDIR(dentry->d_inode->i_mode));
+	BUG_ON(bindex < dbstart(dentry));
+	BUG_ON(bindex > dbend(dentry));
+	err = is_robranch_super(sb, bindex);
+	if (err)
+		goto out;
+
+	hidden_dir_dentry = dtohd_index(dentry, bindex);
+	BUG_ON(!S_ISDIR(hidden_dir_dentry->d_inode->i_mode));
+	hidden_dir = hidden_dir_dentry->d_inode;
+	BUG_ON(!S_ISDIR(hidden_dir->i_mode));
+
+	mutex_lock(&hidden_dir->i_mutex);
+	if (!permission(hidden_dir, MAY_WRITE | MAY_EXEC, NULL))
+		err = do_delete_whiteouts(dentry, bindex, namelist);
+	else {
+		args.u.deletewh.namelist = namelist;
+		args.u.deletewh.dentry = dentry;
+		args.u.deletewh.bindex = bindex;
+		run_sioq(__delete_whiteouts, &args);
+		err = args.err;
+	}
+	mutex_unlock(&hidden_dir->i_mutex);
+
+out:
+	unionfs_read_unlock(sb);
+	return err;
+}
+
+#define RD_NONE 0
+#define RD_CHECK_EMPTY 1
+/* The callback structure for check_empty. */
+struct unionfs_rdutil_callback {
+	int err;
+	int filldir_called;
+	struct unionfs_dir_state *rdstate;
+	int mode;
+};
+
+/* This filldir function makes sure only whiteouts exist within a directory. */
+static int readdir_util_callback(void *dirent, const char *name, int namelen,
+				 loff_t offset, ino_t ino, unsigned int d_type)
+{
+	int err = 0;
+	struct unionfs_rdutil_callback *buf =
+	    (struct unionfs_rdutil_callback *)dirent;
+	int whiteout = 0;
+	struct filldir_node *found;
+
+	buf->filldir_called = 1;
+
+	if (name[0] == '.'
+	    && (namelen == 1 || (name[1] == '.' && namelen == 2)))
+		goto out;
+
+	if ((namelen > UNIONFS_WHLEN) && !strncmp(name, UNIONFS_WHPFX, UNIONFS_WHLEN)) {
+		namelen -= UNIONFS_WHLEN;
+		name += UNIONFS_WHLEN;
+		whiteout = 1;
+	}
+
+	found = find_filldir_node(buf->rdstate, name, namelen);
+	/* If it was found in the table there was a previous whiteout. */
+	if (found)
+		goto out;
+
+	/* If it wasn't found and isn't a whiteout, the directory isn't empty. */
+	err = -ENOTEMPTY;
+	if ((buf->mode == RD_CHECK_EMPTY) && !whiteout)
+		goto out;
+
+	err = add_filldir_node(buf->rdstate, name, namelen,
+			       buf->rdstate->uds_bindex, whiteout);
+
+out:
+	buf->err = err;
+	return err;
+}
+
+/* Is a directory logically empty? */
+int check_empty(struct dentry *dentry, struct unionfs_dir_state **namelist)
+{
+	int err = 0;
+	struct dentry *hidden_dentry = NULL;
+	struct super_block *sb;
+	struct file *hidden_file;
+	struct unionfs_rdutil_callback *buf = NULL;
+	int bindex, bstart, bend, bopaque;
+
+	sb = dentry->d_sb;
+
+	unionfs_read_lock(sb);
+
+	BUG_ON(!S_ISDIR(dentry->d_inode->i_mode));
+
+	if ((err = unionfs_partial_lookup(dentry)))
+		goto out;
+
+	bstart = dbstart(dentry);
+	bend = dbend(dentry);
+	bopaque = dbopaque(dentry);
+	if (0 <= bopaque && bopaque < bend)
+		bend = bopaque;
+
+	buf = kmalloc(sizeof(struct unionfs_rdutil_callback), GFP_KERNEL);
+	if (!buf) {
+		err = -ENOMEM;
+		goto out;
+	}
+	buf->err = 0;
+	buf->mode = RD_CHECK_EMPTY;
+	buf->rdstate = alloc_rdstate(dentry->d_inode, bstart);
+	if (!buf->rdstate) {
+		err = -ENOMEM;
+		goto out;
+	}
+
+	/* Process the hidden directories with rdutil_callback as a filldir. */
+	for (bindex = bstart; bindex <= bend; bindex++) {
+		hidden_dentry = dtohd_index(dentry, bindex);
+		if (!hidden_dentry)
+			continue;
+		if (!hidden_dentry->d_inode)
+			continue;
+		if (!S_ISDIR(hidden_dentry->d_inode->i_mode))
+			continue;
+
+		dget(hidden_dentry);
+		mntget(stohiddenmnt_index(sb, bindex));
+		branchget(sb, bindex);
+		hidden_file =
+		    dentry_open(hidden_dentry, stohiddenmnt_index(sb, bindex),
+				O_RDONLY);
+		if (IS_ERR(hidden_file)) {
+			err = PTR_ERR(hidden_file);
+			dput(hidden_dentry);
+			branchput(sb, bindex);
+			goto out;
+		}
+
+		do {
+			buf->filldir_called = 0;
+			buf->rdstate->uds_bindex = bindex;
+			err = vfs_readdir(hidden_file,
+					  readdir_util_callback, buf);
+			if (buf->err)
+				err = buf->err;
+		} while ((err >= 0) && buf->filldir_called);
+
+		/* fput calls dput for hidden_dentry */
+		fput(hidden_file);
+		branchput(sb, bindex);
+
+		if (err < 0)
+			goto out;
+	}
+
+out:
+	if (buf) {
+		if (namelist && !err)
+			*namelist = buf->rdstate;
+		else if (buf->rdstate)
+			free_rdstate(buf->rdstate);
+		kfree(buf);
+	}
+
+	unionfs_read_unlock(sb);
+
+	return err;
+}
+

  parent reply	other threads:[~2006-09-01  1:47 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 ` Josef Sipek [this message]
2006-09-04  7:09   ` [PATCH 08/22][RFC] Unionfs: Directory manipulation helper functions 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 ` [PATCH 17/22][RFC] Unionfs: Miscellaneous helper functions Josef Sipek
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=20060901014708.GI5788@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;
as well as URLs for NNTP newsgroup(s).