Commit 5f8de487 authored by Russell King's avatar Russell King
Browse files

fs/adfs: move append_filetype_suffix() into adfs_object_fixup() 



append_filetype_suffix() is now only used in adfs_object_fixup(), so
move it there.

Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 2eb0684f

fs/adfs/adfs.h

+0 −13
Original line number Diff line number Diff line
@@ -113,19 +113,6 @@ struct object_info { 
	__u16		filetype;

};



/* RISC OS 12-bit filetype converts to ,xyz hex filename suffix */

static inline int append_filetype_suffix(char *buf, __u16 filetype)

{

	if (filetype == 0xffff)	/* no explicit 12-bit file type was set */

		return 0;



	*buf++ = ',';

	*buf++ = hex_asc_lo(filetype >> 8);

	*buf++ = hex_asc_lo(filetype >> 4);

	*buf++ = hex_asc_lo(filetype >> 0);

	return 4;

}



struct adfs_dir_ops {

	int	(*read)(struct super_block *sb, unsigned int id, unsigned int sz, struct adfs_dir *dir);

	int	(*setpos)(struct adfs_dir *dir, unsigned int fpos);

fs/adfs/dir.c

+8 −5
Original line number Diff line number Diff line
@@ -42,11 +42,14 @@ void adfs_object_fixup(struct adfs_dir *dir, struct object_info *obj) 
		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);

		if (ADFS_SB(dir->sb)->s_ftsuffix) {

			__u16 filetype = obj->filetype;



			obj->name[obj->name_len++] = ',';

			obj->name[obj->name_len++] = hex_asc_lo(filetype >> 8);

			obj->name[obj->name_len++] = hex_asc_lo(filetype >> 4);

			obj->name[obj->name_len++] = hex_asc_lo(filetype >> 0);

		}

	}

}