From 27ac4c4d2a2e55bc2a022e0e41f0993f55439188 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Sat, 30 Apr 2011 01:32:16 -0400 Subject: [PATCH] Unionfs: update name of macro for embedded dentry name length Signed-off-by: Erez Zadok --- fs/unionfs/rdstate.c | 4 ++-- fs/unionfs/union.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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. */ -- 2.34.1