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 24/35] Unionfs: Readdir state
Date: Mon, 4 Dec 2006 07:30:57 -0500 [thread overview]
Message-ID: <11652354712296-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 file contains the routines for maintaining readdir state.
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/rdstate.c | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 282 insertions(+), 0 deletions(-)
diff --git a/fs/unionfs/rdstate.c b/fs/unionfs/rdstate.c
new file mode 100644
index 0000000..5a19157
--- /dev/null
+++ b/fs/unionfs/rdstate.c
@@ -0,0 +1,282 @@
+/*
+ * 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"
+
+/* This file contains the routines for maintaining readdir state. */
+/* There are two structures here, rdstate which is a hash table
+ * of the second structure which is a filldir_node. */
+
+/* This is a struct kmem_cache for filldir nodes, because we allocate a lot
+ * of them and they shouldn't waste memory. If the node has a small name
+ * (as defined by the dentry structure), then we use an inline name to
+ * preserve kmalloc space. */
+static struct kmem_cache *unionfs_filldir_cachep;
+int init_filldir_cache(void)
+{
+ unionfs_filldir_cachep =
+ kmem_cache_create("unionfs_filldir", sizeof(struct filldir_node), 0,
+ SLAB_RECLAIM_ACCOUNT, NULL, NULL);
+
+ return (unionfs_filldir_cachep ? 0 : -ENOMEM);
+}
+
+void destroy_filldir_cache(void)
+{
+ if (unionfs_filldir_cachep)
+ kmem_cache_destroy(unionfs_filldir_cachep);
+}
+
+/* This is a tuning parameter that tells us roughly how big to make the
+ * hash table in directory entries per page. This isn't perfect, but
+ * at least we get a hash table size that shouldn't be too overloaded.
+ * The following averages are based on my home directory.
+ * 14.44693 Overall
+ * 12.29 Single Page Directories
+ * 117.93 Multi-page directories
+ */
+#define DENTPAGE 4096
+#define DENTPERONEPAGE 12
+#define DENTPERPAGE 118
+#define MINHASHSIZE 1
+static int guesstimate_hash_size(struct inode *inode)
+{
+ struct inode *hidden_inode;
+ int bindex;
+ int hashsize = MINHASHSIZE;
+
+ if (UNIONFS_I(inode)->hashsize > 0)
+ return UNIONFS_I(inode)->hashsize;
+
+ for (bindex = ibstart(inode); bindex <= ibend(inode); bindex++) {
+ if (!(hidden_inode = unionfs_lower_inode_idx(inode, bindex)))
+ continue;
+
+ if (hidden_inode->i_size == DENTPAGE)
+ hashsize += DENTPERONEPAGE;
+ else
+ hashsize += (hidden_inode->i_size / DENTPAGE) * DENTPERPAGE;
+ }
+
+ return hashsize;
+}
+
+int init_rdstate(struct file *file)
+{
+ BUG_ON(sizeof(loff_t) != (sizeof(unsigned int) + sizeof(unsigned int)));
+ BUG_ON(UNIONFS_F(file)->rdstate != NULL);
+
+ UNIONFS_F(file)->rdstate = alloc_rdstate(file->f_dentry->d_inode,
+ fbstart(file));
+
+ return (UNIONFS_F(file)->rdstate ? 0 : -ENOMEM);
+}
+
+struct unionfs_dir_state *find_rdstate(struct inode *inode, loff_t fpos)
+{
+ struct unionfs_dir_state *rdstate = NULL;
+ struct list_head *pos;
+
+ spin_lock(&UNIONFS_I(inode)->rdlock);
+ list_for_each(pos, &UNIONFS_I(inode)->readdircache) {
+ struct unionfs_dir_state *r =
+ list_entry(pos, struct unionfs_dir_state, cache);
+ if (fpos == rdstate2offset(r)) {
+ UNIONFS_I(inode)->rdcount--;
+ list_del(&r->cache);
+ rdstate = r;
+ break;
+ }
+ }
+ spin_unlock(&UNIONFS_I(inode)->rdlock);
+ return rdstate;
+}
+
+struct unionfs_dir_state *alloc_rdstate(struct inode *inode, int bindex)
+{
+ int i = 0;
+ int hashsize;
+ int mallocsize = sizeof(struct unionfs_dir_state);
+ struct unionfs_dir_state *rdstate;
+
+ hashsize = guesstimate_hash_size(inode);
+ mallocsize += hashsize * sizeof(struct list_head);
+ /* Round it up to the next highest power of two. */
+ mallocsize--;
+ mallocsize |= mallocsize >> 1;
+ mallocsize |= mallocsize >> 2;
+ mallocsize |= mallocsize >> 4;
+ mallocsize |= mallocsize >> 8;
+ mallocsize |= mallocsize >> 16;
+ mallocsize++;
+
+ /* This should give us about 500 entries anyway. */
+ if (mallocsize > PAGE_SIZE)
+ mallocsize = PAGE_SIZE;
+
+ hashsize = (mallocsize -
+ sizeof(struct unionfs_dir_state)) / sizeof(struct list_head);
+
+ rdstate = kmalloc(mallocsize, GFP_KERNEL);
+ if (!rdstate)
+ return NULL;
+
+ spin_lock(&UNIONFS_I(inode)->rdlock);
+ if (UNIONFS_I(inode)->cookie >= (MAXRDCOOKIE - 1))
+ UNIONFS_I(inode)->cookie = 1;
+ else
+ UNIONFS_I(inode)->cookie++;
+
+ rdstate->cookie = UNIONFS_I(inode)->cookie;
+ spin_unlock(&UNIONFS_I(inode)->rdlock);
+ rdstate->offset = 1;
+ rdstate->access = jiffies;
+ rdstate->bindex = bindex;
+ rdstate->dirpos = 0;
+ rdstate->hashentries = 0;
+ rdstate->size = hashsize;
+ for (i = 0; i < rdstate->size; i++)
+ INIT_LIST_HEAD(&rdstate->list[i]);
+
+ return rdstate;
+}
+
+static void free_filldir_node(struct filldir_node *node)
+{
+ if (node->namelen >= DNAME_INLINE_LEN_MIN)
+ kfree(node->name);
+ kmem_cache_free(unionfs_filldir_cachep, node);
+}
+
+void free_rdstate(struct unionfs_dir_state *state)
+{
+ struct filldir_node *tmp;
+ int i;
+
+ for (i = 0; i < state->size; i++) {
+ struct list_head *head = &(state->list[i]);
+ struct list_head *pos, *n;
+
+ /* traverse the list and deallocate space */
+ list_for_each_safe(pos, n, head) {
+ tmp = list_entry(pos, struct filldir_node, file_list);
+ list_del(&tmp->file_list);
+ free_filldir_node(tmp);
+ }
+ }
+
+ kfree(state);
+}
+
+struct filldir_node *find_filldir_node(struct unionfs_dir_state *rdstate,
+ const char *name, int namelen)
+{
+ int index;
+ unsigned int hash;
+ struct list_head *head;
+ struct list_head *pos;
+ struct filldir_node *cursor = NULL;
+ int found = 0;
+
+ BUG_ON(namelen <= 0);
+
+ hash = full_name_hash(name, namelen);
+ index = hash % rdstate->size;
+
+ head = &(rdstate->list[index]);
+ list_for_each(pos, head) {
+ cursor = list_entry(pos, struct filldir_node, file_list);
+
+ if (cursor->namelen == namelen && cursor->hash == hash &&
+ !strncmp(cursor->name, name, namelen)) {
+ /* a duplicate exists, and hence no need to create
+ * entry to the list */
+ found = 1;
+
+ /* if the duplicate is in this branch, then the file
+ * system is corrupted. */
+ if (cursor->bindex == rdstate->bindex) {
+ printk(KERN_DEBUG "Possible I/O error "
+ "unionfs_filldir: a file is duplicated "
+ "in the same branch %d: %s\n",
+ rdstate->bindex, cursor->name);
+ }
+ break;
+ }
+ }
+
+ if (!found)
+ cursor = NULL;
+
+ return cursor;
+}
+
+inline struct filldir_node *alloc_filldir_node(const char *name, int namelen,
+ unsigned int hash, int bindex)
+{
+ return kmem_cache_alloc(unionfs_filldir_cachep, SLAB_KERNEL);
+}
+
+int add_filldir_node(struct unionfs_dir_state *rdstate, const char *name,
+ int namelen, int bindex, int whiteout)
+{
+ struct filldir_node *new;
+ unsigned int hash;
+ int index;
+ int err = 0;
+ struct list_head *head;
+
+ BUG_ON(namelen <= 0);
+
+ hash = full_name_hash(name, namelen);
+ index = hash % rdstate->size;
+ head = &(rdstate->list[index]);
+
+ new = alloc_filldir_node(name, namelen, hash, bindex);
+ if (!new) {
+ err = -ENOMEM;
+ goto out;
+ }
+
+ INIT_LIST_HEAD(&new->file_list);
+ new->namelen = namelen;
+ new->hash = hash;
+ new->bindex = bindex;
+ new->whiteout = whiteout;
+
+ if (namelen < DNAME_INLINE_LEN_MIN)
+ new->name = new->iname;
+ else {
+ new->name = kmalloc(namelen + 1, GFP_KERNEL);
+ if (!new->name) {
+ kmem_cache_free(unionfs_filldir_cachep, new);
+ new = NULL;
+ goto out;
+ }
+ }
+
+ memcpy(new->name, name, namelen);
+ new->name[namelen] = '\0';
+
+ rdstate->hashentries++;
+
+ list_add(&(new->file_list), head);
+out:
+ return err;
+}
+
--
1.4.3.3
next prev parent reply other threads:[~2006-12-04 12:30 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 ` Josef 'Jeff' Sipek [this message]
2006-12-05 21:40 ` [PATCH 24/35] Unionfs: Readdir state 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 ` [PATCH 28/35] Unionfs: Miscellaneous helper functions Josef 'Jeff' Sipek
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=11652354712296-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).