diff options
author | Matt Fleming <matt.fleming@intel.com> | 2013-04-30 11:30:24 +0100 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2013-04-30 11:42:13 +0100 |
commit | a614e1923d5389d01f3545ee4a90e39a04d0c90d (patch) | |
tree | e8e32dba12a66ffd26d78f015a142ac28e19ad8e /fs/reiserfs/xattr.c | |
parent | Merge remote-tracking branch 'efi/chainsaw' into x86/efi (diff) | |
parent | Linux 3.9 (diff) | |
download | linux-dev-a614e1923d5389d01f3545ee4a90e39a04d0c90d.tar.xz linux-dev-a614e1923d5389d01f3545ee4a90e39a04d0c90d.zip |
Merge tag 'v3.9' into efi-for-tip2
Resolve conflicts for Ingo.
Conflicts:
drivers/firmware/Kconfig
drivers/firmware/efivars.c
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'fs/reiserfs/xattr.c')
-rw-r--r-- | fs/reiserfs/xattr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index c196369fe408..4cce1d9552fb 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c @@ -187,8 +187,8 @@ fill_with_dentries(void *buf, const char *name, int namelen, loff_t offset, if (dbuf->count == ARRAY_SIZE(dbuf->dentries)) return -ENOSPC; - if (name[0] == '.' && (name[1] == '\0' || - (name[1] == '.' && name[2] == '\0'))) + if (name[0] == '.' && (namelen < 2 || + (namelen == 2 && name[1] == '.'))) return 0; dentry = lookup_one_len(name, dbuf->xadir, namelen); |