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 f745fbc6019b399ae6cb1901e2092a8e270f83be..d57f1f873d0c594f8940fe797da8d28c7f7625bf 100644 (file)
--- 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 d49c8343a54ff5ef5891ff4d311af7578cf7f551..6c7b9aaf9e8dc5f65dde54d02aadd5bd51f91071 100644 (file)
--- 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. */