author: Fabian Frederick <fabf@skynet.be> 2015-02-17 13:46:23 -0800
committer: Linus Torvalds <torvalds@linux-foundation.org> 2015-02-17 14:34:52 -0800
commit: f157853e407c0611cd6acbc400fa6c7be420b1bd
parent: eeb36f8e938d151fc5e12e96ae13d0e283be357e
Commit Summary:
Diffstat:
1 file 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);