diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-04-26 00:15:29 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-05-28 15:41:34 -0700 |
| commit | eaa693f4dcf1ca64b41b02d907e9c401c085cf59 (patch) | |
| tree | 817b77d84ced4f1e539793d50ac7b2d02f6ab862 | |
| parent | c879f90da96c6369080be868162ef96aeef4a439 (diff) | |
| download | linux-eaa693f4dcf1ca64b41b02d907e9c401c085cf59.tar.bz2 | |
f2fs: introduce dot and dotdot name check
This patch adds an inline function to check dot and dotdot names.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fs/f2fs/f2fs.h | 11 | ||||
| -rw-r--r-- | fs/f2fs/hash.c | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index e99a404d97d7..b8f99fd4fcff 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1454,6 +1454,17 @@ static inline void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi) sbi->sb->s_flags |= MS_RDONLY; } +static inline bool is_dot_dotdot(const struct qstr *str) +{ + if (str->len == 1 && str->name[0] == '.') + return true; + + if (str->len == 2 && str->name[0] == '.' && str->name[1] == '.') + return true; + + return false; +} + #define get_inode_mode(i) \ ((is_inode_flag_set(F2FS_I(i), FI_ACL_MODE)) ? \ (F2FS_I(i)->i_acl_mode) : ((i)->i_mode)) diff --git a/fs/f2fs/hash.c b/fs/f2fs/hash.c index a844fcfb9a8d..71b7206c431e 100644 --- a/fs/f2fs/hash.c +++ b/fs/f2fs/hash.c @@ -79,8 +79,7 @@ f2fs_hash_t f2fs_dentry_hash(const struct qstr *name_info) const unsigned char *name = name_info->name; size_t len = name_info->len; - if ((len <= 2) && (name[0] == '.') && - (name[1] == '.' || name[1] == '\0')) + if (is_dot_dotdot(name_info)) return 0; /* Initialize the default seed for the hash checksum functions */ |