Commit 411c49bc authored by Russell King's avatar Russell King
Browse files

fs/adfs: factor out object fixups 



Factor out the directory object fixups, which parse the filetype and
optionally apply the filetype suffix to the filename.

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

fs/adfs/adfs.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

fs/adfs/dir.c

+21 −0
Original line number Diff line number Diff line
@@ -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)

{

fs/adfs/dir_f.c

+1 −16
Original line number Diff line number Diff line
@@ -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);

}



/*

fs/adfs/dir_fplus.c

+1 −17
Original line number Diff line number Diff line
@@ -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;