Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszere...

[firefly-linux-kernel-4.4.55.git] / fs / affs / amigaffs.c

diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index 118d782b041f97bca6066a91ecaa0d1bf76f9a5a..388da1ea815d07dd43af7a856293a4c3c840e400 100644 (file)
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -486,8 +486,7 @@ affs_check_name(const unsigned char *name, int len, bool notruncate)
        if (len > AFFSNAMEMAX) {
                if (notruncate)
                        return -ENAMETOOLONG;
-               else
-                       len = AFFSNAMEMAX;
+               len = AFFSNAMEMAX;
        }
        for (i = 0; i < len; i++) {
                if (name[i] < ' ' || name[i] == ':'