diff options
| author | Fabian Frederick <fabf@skynet.be> | 2015-02-17 22:46:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 23:34:52 +0100 |
| commit | f157853e407c0611cd6acbc400fa6c7be420b1bd (patch) | |
| tree | c8ee0adacfd4b798228d0ccd65de3f3ec0ce24d5 /fs/affs/amigaffs.c | |
| parent | fs/affs: use unsigned int for string lengths (diff) | |
| download | linux-f157853e407c0611cd6acbc400fa6c7be420b1bd.tar.xz linux-f157853e407c0611cd6acbc400fa6c7be420b1bd.zip | |
fs/affs: define AFFSNAMEMAX to replace constant use
30 was used all over the place to compare name length against
AFFS maximum name length.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/affs/amigaffs.c')
| -rw-r--r-- | fs/affs/amigaffs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c index 0836f6fff641..118d782b041f 100644 --- a/fs/affs/amigaffs.c +++ b/fs/affs/amigaffs.c @@ -483,11 +483,11 @@ affs_check_name(const unsigned char *name, int len, bool notruncate) { int i; - if (len > 30) { + if (len > AFFSNAMEMAX) { if (notruncate) return -ENAMETOOLONG; else - len = 30; + len = AFFSNAMEMAX; } for (i = 0; i < len; i++) { if (name[i] < ' ' || name[i] == ':' @@ -508,7 +508,7 @@ affs_check_name(const unsigned char *name, int len, bool notruncate) int affs_copy_name(unsigned char *bstr, struct dentry *dentry) { - u32 len = min(dentry->d_name.len, 30u); + u32 len = min(dentry->d_name.len, AFFSNAMEMAX); *bstr++ = len; memcpy(bstr, dentry->d_name.name, len); |