6 files changed, 72 insertions, 42 deletions

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index 3952121f2f28..25b23b1e7f22 100644
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -5,14 +5,6 @@
 #include <linux/mutex.h>
 #include <linux/workqueue.h>
 
-/* AmigaOS allows file names with up to 30 characters length.
- * Names longer than that will be silently truncated. If you
- * want to disallow this, comment out the following #define.
- * Creating filesystem objects with longer names will then
- * result in an error (ENAMETOOLONG).
- */
-/*#define AFFS_NO_TRUNCATE */
-
 /* Ugly macros make the code more pretty. */
 
 #define GET_END_PTR(st,p,sz)             ((st *)((char *)(p)+((sz)-sizeof(st))))
@@ -28,7 +20,6 @@
 
 #define AFFS_CACHE_SIZE         PAGE_SIZE
 
-#define AFFS_MAX_PREALLOC       32
 #define AFFS_LC_SIZE            (AFFS_CACHE_SIZE/sizeof(u32)/2)
 #define AFFS_AC_SIZE            (AFFS_CACHE_SIZE/sizeof(struct affs_ext_key)/2)
 #define AFFS_AC_MASK            (AFFS_AC_SIZE-1)
@@ -118,6 +109,7 @@ struct affs_sb_info {
 #define SF_OFS          0x0200          /* Old filesystem */
 #define SF_PREFIX       0x0400          /* Buffer for prefix is allocated */
 #define SF_VERBOSE      0x0800          /* Talk about fs when mounting */
+#define SF_NO_TRUNCATE  0x1000          /* Don't truncate filenames */
 
 /* short cut to get to the affs specific sb data */
 static inline struct affs_sb_info *AFFS_SB(struct super_block *sb)
@@ -137,9 +129,13 @@ extern void	affs_fix_checksum(struct super_block *sb, struct buffer_head *bh);
 extern void     secs_to_datestamp(time_t secs, struct affs_date *ds);
 extern umode_t  prot_to_mode(u32 prot);
 extern void     mode_to_prot(struct inode *inode);
-extern void     affs_error(struct super_block *sb, const char *function, const char *fmt, ...);
-extern void     affs_warning(struct super_block *sb, const char *function, const char *fmt, ...);
-extern int      affs_check_name(const unsigned char *name, int len);
+extern void     affs_error(struct super_block *sb, const char *function,
+                           const char *fmt, ...);
+extern void     affs_warning(struct super_block *sb, const char *function,
+                             const char *fmt, ...);
+extern bool     affs_nofilenametruncate(const struct dentry *dentry);
+extern int      affs_check_name(const unsigned char *name, int len,
+                                bool notruncate);
 extern int      affs_copy_name(unsigned char *bstr, struct dentry *dentry);
 
 /* bitmap. c */
diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index d9a43674cb94..533a322c41c0 100644
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -471,20 +471,27 @@ affs_warning(struct super_block *sb, const char *function, const char *fmt, ...)
                 function,ErrorBuffer);
 }
 
+bool
+affs_nofilenametruncate(const struct dentry *dentry)
+{
+        struct inode *inode = dentry->d_inode;
+        return AFFS_SB(inode->i_sb)->s_flags & SF_NO_TRUNCATE;
+
+}
+
 /* Check if the name is valid for a affs object. */
 
 int
-affs_check_name(const unsigned char *name, int len)
+affs_check_name(const unsigned char *name, int len, bool notruncate)
 {
         int      i;
 
-        if (len > 30)
-#ifdef AFFS_NO_TRUNCATE
-                return -ENAMETOOLONG;
-#else
-                len = 30;
-#endif
-
+        if (len > 30) {
+                if (notruncate)
+                        return -ENAMETOOLONG;
+                else
+                        len = 30;
+        }
         for (i = 0; i < len; i++) {
                 if (name[i] < ' ' || name[i] == ':'
                     || (name[i] > 0x7e && name[i] < 0xa0))
diff --git a/fs/affs/dir.c b/fs/affs/dir.c
index f1eba8c3644e..cbbda476a805 100644
--- a/fs/affs/dir.c
+++ b/fs/affs/dir.c
@@ -52,8 +52,10 @@ affs_readdir(struct file *file, struct dir_context *ctx)
         int                      hash_pos;
         int                      chain_pos;
         u32                      ino;
+        int                      error = 0;
 
-        pr_debug("AFFS: readdir(ino=%lu,f_pos=%lx)\n",inode->i_ino,(unsigned long)ctx->pos);
+        pr_debug("AFFS: readdir(ino=%lu,f_pos=%lx)\n",
+                 inode->i_ino, (unsigned long)ctx->pos);
 
         if (ctx->pos < 2) {
                 file->private_data = (void *)0;
@@ -72,7 +74,7 @@ affs_readdir(struct file *file, struct dir_context *ctx)
         }
         dir_bh = affs_bread(sb, inode->i_ino);
         if (!dir_bh)
-                goto readdir_out;
+                goto out_unlock_dir;
 
         /* If the directory hasn't changed since the last call to readdir(),
          * we can jump directly to where we left off.
@@ -88,7 +90,8 @@ affs_readdir(struct file *file, struct dir_context *ctx)
                 fh_bh = affs_bread(sb, ino);
                 if (!fh_bh) {
                         affs_error(sb, "readdir","Cannot read block %d", i);
-                        return -EIO;
+                        error = -EIO;
+                        goto out_brelse_dir;
                 }
                 ino = be32_to_cpu(AFFS_TAIL(sb, fh_bh)->hash_chain);
                 affs_brelse(fh_bh);
@@ -107,29 +110,34 @@ inside:
                 do {
                         fh_bh = affs_bread(sb, ino);
                         if (!fh_bh) {
-                                affs_error(sb, "readdir","Cannot read block %d", ino);
+                                affs_error(sb, "readdir",
+                                           "Cannot read block %d", ino);
                                 break;
                         }
 
                         namelen = min(AFFS_TAIL(sb, fh_bh)->name[0], (u8)30);
                         name = AFFS_TAIL(sb, fh_bh)->name + 1;
-                        pr_debug("AFFS: readdir(): filldir(\"%.*s\", ino=%u), hash=%d, f_pos=%x\n",
+                        pr_debug("AFFS: readdir(): dir_emit(\"%.*s\", "
+                                 "ino=%u), hash=%d, f_pos=%x\n",
                                  namelen, name, ino, hash_pos, (u32)ctx->pos);
+
                         if (!dir_emit(ctx, name, namelen, ino, DT_UNKNOWN))
-                                goto readdir_done;
+                                goto done;
                         ctx->pos++;
                         ino = be32_to_cpu(AFFS_TAIL(sb, fh_bh)->hash_chain);
                         affs_brelse(fh_bh);
                         fh_bh = NULL;
                 } while (ino);
         }
-readdir_done:
+done:
         file->f_version = inode->i_version;
         file->private_data = (void *)(long)ino;
+        affs_brelse(fh_bh);
 
-readdir_out:
+out_brelse_dir:
         affs_brelse(dir_bh);
-        affs_brelse(fh_bh);
+
+out_unlock_dir:
         affs_unlock_dir(inode);
-        return 0;
+        return error;
 }
diff --git a/fs/affs/inode.c b/fs/affs/inode.c
index 0e092d08680e..96df91e8c334 100644
--- a/fs/affs/inode.c
+++ b/fs/affs/inode.c
@@ -259,7 +259,7 @@ affs_evict_inode(struct inode *inode)
 {
         unsigned long cache_page;
         pr_debug("AFFS: evict_inode(ino=%lu, nlink=%u)\n", inode->i_ino, inode->i_nlink);
-        truncate_inode_pages(&inode->i_data, 0);
+        truncate_inode_pages_final(&inode->i_data);
 
         if (!inode->i_nlink) {
                 inode->i_size = 0;
diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index c36cbb4537a2..6dae1ccd176d 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -60,13 +60,13 @@ affs_get_toupper(struct super_block *sb)
  * Note: the dentry argument is the parent dentry.
  */
 static inline int
-__affs_hash_dentry(struct qstr *qstr, toupper_t toupper)
+__affs_hash_dentry(struct qstr *qstr, toupper_t toupper, bool notruncate)
 {
         const u8 *name = qstr->name;
         unsigned long hash;
         int i;
 
-        i = affs_check_name(qstr->name, qstr->len);
+        i = affs_check_name(qstr->name, qstr->len, notruncate);
         if (i)
                 return i;
 
@@ -82,16 +82,22 @@ __affs_hash_dentry(struct qstr *qstr, toupper_t toupper)
 static int
 affs_hash_dentry(const struct dentry *dentry, struct qstr *qstr)
 {
-        return __affs_hash_dentry(qstr, affs_toupper);
+        return __affs_hash_dentry(qstr, affs_toupper,
+                                  affs_nofilenametruncate(dentry));
+
 }
+
 static int
 affs_intl_hash_dentry(const struct dentry *dentry, struct qstr *qstr)
 {
-        return __affs_hash_dentry(qstr, affs_intl_toupper);
+        return __affs_hash_dentry(qstr, affs_intl_toupper,
+                                  affs_nofilenametruncate(dentry));
+
 }
 
 static inline int __affs_compare_dentry(unsigned int len,
-                const char *str, const struct qstr *name, toupper_t toupper)
+                const char *str, const struct qstr *name, toupper_t toupper,
+                bool notruncate)
 {
         const u8 *aname = str;
         const u8 *bname = name->name;
@@ -101,7 +107,7 @@ static inline int __affs_compare_dentry(unsigned int len,
          * must be valid. 'name' must be validated first.
          */
 
-        if (affs_check_name(name->name, name->len))
+        if (affs_check_name(name->name, name->len, notruncate))
                 return 1;
 
         /*
@@ -126,13 +132,18 @@ static int
 affs_compare_dentry(const struct dentry *parent, const struct dentry *dentry,
                 unsigned int len, const char *str, const struct qstr *name)
 {
-        return __affs_compare_dentry(len, str, name, affs_toupper);
+
+        return __affs_compare_dentry(len, str, name, affs_toupper,
+                                     affs_nofilenametruncate(parent));
 }
+
 static int
 affs_intl_compare_dentry(const struct dentry *parent, const struct dentry *dentry,
                 unsigned int len, const char *str, const struct qstr *name)
 {
-        return __affs_compare_dentry(len, str, name, affs_intl_toupper);
+        return __affs_compare_dentry(len, str, name, affs_intl_toupper,
+                                     affs_nofilenametruncate(parent));
+
 }
 
 /*
@@ -411,7 +422,10 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry,
                  (u32)old_dir->i_ino, (int)old_dentry->d_name.len, old_dentry->d_name.name,
                  (u32)new_dir->i_ino, (int)new_dentry->d_name.len, new_dentry->d_name.name);
 
-        retval = affs_check_name(new_dentry->d_name.name,new_dentry->d_name.len);
+        retval = affs_check_name(new_dentry->d_name.name,
+                                 new_dentry->d_name.len,
+                                 affs_nofilenametruncate(old_dentry));
+
         if (retval)
                 return retval;
 
diff --git a/fs/affs/super.c b/fs/affs/super.c
index d098731b82ff..6d589f28bf9b 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -128,7 +128,7 @@ static void init_once(void *foo)
         inode_init_once(&ei->vfs_inode);
 }
 
-static int init_inodecache(void)
+static int __init init_inodecache(void)
 {
         affs_inode_cachep = kmem_cache_create("affs_inode_cache",
                                              sizeof(struct affs_inode_info),
@@ -163,7 +163,7 @@ static const struct super_operations affs_sops = {
 };
 
 enum {
-        Opt_bs, Opt_mode, Opt_mufs, Opt_prefix, Opt_protect,
+        Opt_bs, Opt_mode, Opt_mufs, Opt_notruncate, Opt_prefix, Opt_protect,
         Opt_reserved, Opt_root, Opt_setgid, Opt_setuid,
         Opt_verbose, Opt_volume, Opt_ignore, Opt_err,
 };
@@ -172,6 +172,7 @@ static const match_table_t tokens = {
         {Opt_bs, "bs=%u"},
         {Opt_mode, "mode=%o"},
         {Opt_mufs, "mufs"},
+        {Opt_notruncate, "nofilenametruncate"},
         {Opt_prefix, "prefix=%s"},
         {Opt_protect, "protect"},
         {Opt_reserved, "reserved=%u"},
@@ -233,6 +234,9 @@ parse_options(char *options, kuid_t *uid, kgid_t *gid, int *mode, int *reserved,
                 case Opt_mufs:
                         *mount_opts |= SF_MUFS;
                         break;
+                case Opt_notruncate:
+                        *mount_opts |= SF_NO_TRUNCATE;
+                        break;
                 case Opt_prefix:
                         *prefix = match_strdup(&args[0]);
                         if (!*prefix)
@@ -530,6 +534,7 @@ affs_remount(struct super_block *sb, int *flags, char *data)
 
         pr_debug("AFFS: remount(flags=0x%x,opts=\"%s\")\n",*flags,data);
 
+        sync_filesystem(sb);
         *flags |= MS_NODIRATIME;
 
         memcpy(volume, sbi->s_volume, 32);