diff options
| author | Charles Manning <cdhmanning@gmail.com> | 2010-11-09 12:01:50 +1300 |
|---|---|---|
| committer | Charles Manning <cdhmanning@gmail.com> | 2010-11-09 12:01:50 +1300 |
| commit | 376375059d26aeb3fca08ba9dfd1f9b8b5842c75 (patch) | |
| tree | c2e593c76b0e99f752a6ac187988921ee87d34c5 /yaffs_guts.c | |
| parent | 25633e8452addb4efafd1dedde957e1b14a07fd9 (diff) | |
yaffs: Remove SHORT_NAMES_IN_RAM and WIDE_TNODE_DISABLE configs
These have been removed from Linux as their use is discouraged except
for debugging purposes.
The logic has also changed for SHORT_NAMES_IN_RAM. This is now negative
logic. Set CONFIG_YAFFS_NO_SHORT_NAMES to **disable** short names.
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Diffstat (limited to 'yaffs_guts.c')
| -rw-r--r-- | yaffs_guts.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/yaffs_guts.c b/yaffs_guts.c index 53c2ff6..110a3c2 100644 --- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -604,12 +604,10 @@ static u16 yaffs_calc_name_sum(const YCHAR * name) void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name) { -#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM - memset(obj->short_name, 0, - sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH + 1)); - if (name - && yaffs_strnlen(name, - YAFFS_SHORT_NAME_LENGTH + 1) <= +#ifndef CONFIG_YAFFS_NO_SHORT_NAMES + memset(obj->short_name, 0, sizeof(obj->short_name)); + if (name && + yaffs_strnlen(name, YAFFS_SHORT_NAME_LENGTH + 1) <= YAFFS_SHORT_NAME_LENGTH) yaffs_strcpy(obj->short_name, name); else @@ -4540,7 +4538,7 @@ int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR * name, int buffer_size) if (obj->obj_id == YAFFS_OBJECTID_LOSTNFOUND) { yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffer_size - 1); } -#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM +#ifndef CONFIG_YAFFS_NO_SHORT_NAMES else if (obj->short_name[0]) { yaffs_strcpy(name, obj->short_name); } |