4 files changed, 24 insertions, 33 deletions

diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h
index c76db75f02aa..1097bee65fa9 100644
--- a/fs/adfs/adfs.h
+++ b/fs/adfs/adfs.h
@@ -172,6 +172,7 @@ extern const struct dentry_operations adfs_dentry_operations;
 extern const struct adfs_dir_ops adfs_f_dir_ops;
 extern const struct adfs_dir_ops adfs_fplus_dir_ops;
 
+void adfs_object_fixup(struct adfs_dir *dir, struct object_info *obj);
 extern int adfs_dir_update(struct super_block *sb, struct object_info *obj,
                            int wait);
 
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c
index be4b4f950500..03490f16300d 100644
--- a/fs/adfs/dir.c
+++ b/fs/adfs/dir.c
@@ -16,6 +16,27 @@
  */
 static DEFINE_RWLOCK(adfs_dir_lock);
 
+void adfs_object_fixup(struct adfs_dir *dir, struct object_info *obj)
+{
+        obj->filetype = -1;
+
+        /*
+         * object is a file and is filetyped and timestamped?
+         * RISC OS 12-bit filetype is stored in load_address[19:8]
+         */
+        if ((0 == (obj->attr & ADFS_NDA_DIRECTORY)) &&
+            (0xfff00000 == (0xfff00000 & obj->loadaddr))) {
+                obj->filetype = (__u16) ((0x000fff00 & obj->loadaddr) >> 8);
+
+                /* optionally append the ,xyz hex filetype suffix */
+                if (ADFS_SB(dir->sb)->s_ftsuffix)
+                        obj->name_len +=
+                                append_filetype_suffix(
+                                        &obj->name[obj->name_len],
+                                        obj->filetype);
+        }
+}
+
 static int
 adfs_readdir(struct file *file, struct dir_context *ctx)
 {
diff --git a/fs/adfs/dir_f.c b/fs/adfs/dir_f.c
index 0fbfd0b04ae0..1bab896918ed 100644
--- a/fs/adfs/dir_f.c
+++ b/fs/adfs/dir_f.c
@@ -216,23 +216,8 @@ adfs_dir2obj(struct adfs_dir *dir, struct object_info *obj,
         obj->execaddr = adfs_readval(de->direxec, 4);
         obj->size     = adfs_readval(de->dirlen,  4);
         obj->attr     = de->newdiratts;
-        obj->filetype = -1;
 
-        /*
-         * object is a file and is filetyped and timestamped?
-         * RISC OS 12-bit filetype is stored in load_address[19:8]
-         */
-        if ((0 == (obj->attr & ADFS_NDA_DIRECTORY)) &&
-                (0xfff00000 == (0xfff00000 & obj->loadaddr))) {
-                obj->filetype = (__u16) ((0x000fff00 & obj->loadaddr) >> 8);
-
-                /* optionally append the ,xyz hex filetype suffix */
-                if (ADFS_SB(dir->sb)->s_ftsuffix)
-                        obj->name_len +=
-                                append_filetype_suffix(
-                                        &obj->name[obj->name_len],
-                                        obj->filetype);
-        }
+        adfs_object_fixup(dir, obj);
 }
 
 /*
diff --git a/fs/adfs/dir_fplus.c b/fs/adfs/dir_fplus.c
index c92cfb638c18..308009d00a5b 100644
--- a/fs/adfs/dir_fplus.c
+++ b/fs/adfs/dir_fplus.c
@@ -197,23 +197,7 @@ adfs_fplus_getnext(struct adfs_dir *dir, struct object_info *obj)
                 if (obj->name[i] == '/')
                         obj->name[i] = '.';
 
-        obj->filetype = -1;
-
-        /*
-         * object is a file and is filetyped and timestamped?
-         * RISC OS 12-bit filetype is stored in load_address[19:8]
-         */
-        if ((0 == (obj->attr & ADFS_NDA_DIRECTORY)) &&
-                (0xfff00000 == (0xfff00000 & obj->loadaddr))) {
-                obj->filetype = (__u16) ((0x000fff00 & obj->loadaddr) >> 8);
-
-                /* optionally append the ,xyz hex filetype suffix */
-                if (ADFS_SB(dir->sb)->s_ftsuffix)
-                        obj->name_len +=
-                                append_filetype_suffix(
-                                        &obj->name[obj->name_len],
-                                        obj->filetype);
-        }
+        adfs_object_fixup(dir, obj);
 
         dir->pos += 1;
         ret = 0;