Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45254b4f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

efs: move headers out of include/linux/ 



Merge include/linux/efs_fs{_i,_dir}.h into fs/efs/efs.h.  efs_vh.h remains
there because this is the IRIX volume header and shouldn't really be
handled by efs but by the partitioning code.  efs_sb.h remains there for
now because it's exported to userspace.  Of course this wrong and aboot
should have a copy of it's own, but I'll leave that to a separate patch to
avoid any contention.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 48f15b93

fs/efs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
 */



#include <linux/buffer_head.h>

#include <linux/efs_fs.h>

#include <linux/smp_lock.h>

#include "efs.h"



static int efs_readdir(struct file *, void *, filldir_t);

include/linux/efs_fs_i.h→fs/efs/efs.h

+140 −0
Original line number Diff line number Diff line 
/*

 * efs_fs_i.h

 *

 * Copyright (c) 1999 Al Smith

 *

 * Portions derived from work (c) 1995,1996 Christian Vogelgsang.

 * Portions derived from IRIX header files (c) 1988 Silicon Graphics

 */

#ifndef _EFS_EFS_H_

#define _EFS_EFS_H_



#include <linux/fs.h>

#include <asm/uaccess.h>



#define EFS_VERSION "1.0a"



#ifndef	__EFS_FS_I_H__

#define	__EFS_FS_I_H__

static const char cprt[] = "EFS: "EFS_VERSION" - (c) 1999 Al Smith <Al.Smith@aeschi.ch.eu.org>";





/* 1 block is 512 bytes */

#define	EFS_BLOCKSIZE_BITS	9

#define	EFS_BLOCKSIZE		(1 << EFS_BLOCKSIZE_BITS)



typedef	int32_t		efs_block_t;

typedef uint32_t	efs_ino_t;
@@ -64,5 +74,67 @@ struct efs_inode_info { 
	struct inode	vfs_inode;

};



#endif	/* __EFS_FS_I_H__ */

#include <linux/efs_fs_sb.h>



#define EFS_DIRBSIZE_BITS	EFS_BLOCKSIZE_BITS

#define EFS_DIRBSIZE		(1 << EFS_DIRBSIZE_BITS)



struct efs_dentry {

	__be32		inode;

	unsigned char	namelen;

	char		name[3];

};



#define EFS_DENTSIZE	(sizeof(struct efs_dentry) - 3 + 1)

#define EFS_MAXNAMELEN  ((1 << (sizeof(char) * 8)) - 1)



#define EFS_DIRBLK_HEADERSIZE	4

#define EFS_DIRBLK_MAGIC	0xbeef	/* moo */



struct efs_dir {

	__be16	magic;

	unsigned char	firstused;

	unsigned char	slots;



	unsigned char	space[EFS_DIRBSIZE - EFS_DIRBLK_HEADERSIZE];

};



#define EFS_MAXENTS \

	((EFS_DIRBSIZE - EFS_DIRBLK_HEADERSIZE) / \

	 (EFS_DENTSIZE + sizeof(char)))



#define EFS_SLOTAT(dir, slot) EFS_REALOFF((dir)->space[slot])



#define EFS_REALOFF(offset) ((offset << 1))





static inline struct efs_inode_info *INODE_INFO(struct inode *inode)

{

	return container_of(inode, struct efs_inode_info, vfs_inode);

}



static inline struct efs_sb_info *SUPER_INFO(struct super_block *sb)

{

	return sb->s_fs_info;

}



struct statfs;

struct fid;



extern const struct inode_operations efs_dir_inode_operations;

extern const struct file_operations efs_dir_operations;

extern const struct address_space_operations efs_symlink_aops;



extern struct inode *efs_iget(struct super_block *, unsigned long);

extern efs_block_t efs_map_block(struct inode *, efs_block_t);

extern int efs_get_block(struct inode *, sector_t, struct buffer_head *, int);



extern struct dentry *efs_lookup(struct inode *, struct dentry *, struct nameidata *);

extern struct dentry *efs_fh_to_dentry(struct super_block *sb, struct fid *fid,

		int fh_len, int fh_type);

extern struct dentry *efs_fh_to_parent(struct super_block *sb, struct fid *fid,

		int fh_len, int fh_type);

extern struct dentry *efs_get_parent(struct dentry *);

extern int efs_bmap(struct inode *, int);



#endif /* _EFS_EFS_H_ */

fs/efs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 */



#include <linux/buffer_head.h>

#include <linux/efs_fs.h>

#include "efs.h"



int efs_get_block(struct inode *inode, sector_t iblock,

		  struct buffer_head *bh_result, int create)

fs/efs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ 
 *              and from work (c) 1998 Mike Shaver.

 */



#include <linux/efs_fs.h>

#include <linux/efs_fs_sb.h>

#include <linux/buffer_head.h>

#include <linux/module.h>

#include <linux/fs.h>

#include "efs.h"

#include <linux/efs_fs_sb.h>



static int efs_readpage(struct file *file, struct page *page)

{

fs/efs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 


#include <linux/buffer_head.h>

#include <linux/string.h>

#include <linux/efs_fs.h>

#include <linux/smp_lock.h>

#include <linux/exportfs.h>

#include "efs.h"





static efs_ino_t efs_find_entry(struct inode *inode, const char *name, int len) {