From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Sat, 30 Apr 2011 05:32:16 +0000 (-0400)
Subject: Unionfs: update name of macro for embedded dentry name length
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=27ac4c4d2a2e55bc2a022e0e41f0993f55439188;p=unionfs-2.6.39.y.git

Unionfs: update name of macro for embedded dentry name length

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
---

diff --git a/fs/unionfs/rdstate.c b/fs/unionfs/rdstate.c
index f745fbc6019..d57f1f873d0 100644
--- a/fs/unionfs/rdstate.c
+++ b/fs/unionfs/rdstate.c
@@ -162,7 +162,7 @@ struct unionfs_dir_state *alloc_rdstate(struct inode *inode, int bindex)
 
 static void free_filldir_node(struct filldir_node *node)
 {
-	if (node->namelen >= DNAME_INLINE_LEN_MIN)
+	if (node->namelen >= DNAME_INLINE_LEN)
 		kfree(node->name);
 	kmem_cache_free(unionfs_filldir_cachep, node);
 }
@@ -263,7 +263,7 @@ int add_filldir_node(struct unionfs_dir_state *rdstate, const char *name,
 	new->bindex = bindex;
 	new->whiteout = whiteout;
 
-	if (namelen < DNAME_INLINE_LEN_MIN) {
+	if (namelen < DNAME_INLINE_LEN) {
 		new->name = new->iname;
 	} else {
 		new->name = kmalloc(namelen + 1, GFP_KERNEL);
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index d49c8343a54..6c7b9aaf9e8 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -190,7 +190,7 @@ struct filldir_node {
 	int whiteout;
 
 	/* Inline name, so we don't need to separately kmalloc small ones */
-	char iname[DNAME_INLINE_LEN_MIN];
+	char iname[DNAME_INLINE_LEN];
 };
 
 /* Directory hash table. */