patch-pre2.0.6 linux/include/linux/affs_fs.h

Next file: linux/include/linux/affs_fs_i.h
Previous file: linux/include/asm-i386/unaligned.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file pre2.0.5/linux/include/linux/affs_fs.h linux/include/linux/affs_fs.h
@@ -5,7 +5,6 @@
  */
 
 #include <linux/types.h>
-#include <linux/amigaffs.h>
 
 #define AFFS_SUPER_MAGIC 0xadff
 
@@ -21,29 +20,37 @@
 /* Get the fs type given an inode */
 #define AFFS_I2FSTYPE(inode) ((inode)->i_sb->u.affs_sb.s_flags & SF_INTL)
 
+struct DateStamp
+{
+  __u32 ds_Days;
+  __u32 ds_Minute;
+  __u32 ds_Tick;
+};
+
+
 /* --- Prototypes -----------------------------------------------------------------------------	*/
 
 /* amigaffs.c */
 
 extern int		   affs_get_key_entry(int bsize, void *data, int entry_pos);
-extern int		   affs_find_next_hash_entry(int bsize, void *dir_data, __u32 *hash_pos);
+extern int		   affs_find_next_hash_entry(int bsize, void *dir_data, int *hash_pos);
 extern int		   affs_get_file_name(int bsize, void *fh_data, char **name);
-extern __u32		   affs_checksum_block(int bsize, void *data, __s32 *ptype, __s32 *stype);
+extern unsigned int	   affs_checksum_block(int bsize, void *data, int *ptype, int *stype);
 extern void		   affs_fix_checksum(int bsize, void *data, int cspos);
 extern void		   secs_to_datestamp(int secs, struct DateStamp *ds);
-extern int		   prot_to_mode(__u32 prot);
-extern __u32		   mode_to_prot(int mode);
+extern int		   prot_to_mode(unsigned int prot);
+extern unsigned int	   mode_to_prot(int mode);
 extern int		   affs_fix_hash_pred(struct inode *startino, int startoffset,
-		 			      __s32 key, __s32 newkey);
-extern int		   affs_fix_link_pred(struct inode *startino, __s32 key, __s32 newkey);
+		 			      int key, int newkey);
+extern int		   affs_fix_link_pred(struct inode *startino, int key, int newkey);
 
 /* bitmap. c */
 
 extern int		   affs_count_free_blocks(struct super_block *s);
-extern int		   affs_count_free_bits(int blocksize, const __u8 *data);
-extern void		   affs_free_block(struct super_block *sb, __s32 block);
-extern __s32		   affs_new_header(struct inode *inode);
-extern __s32		   affs_new_data(struct inode *inode);
+extern int		   affs_count_free_bits(int blocksize, const char *data);
+extern void		   affs_free_block(struct super_block *sb, int block);
+extern int		   affs_new_header(struct inode *inode);
+extern int		   affs_new_data(struct inode *inode);
 extern void		   affs_make_zones(struct super_block *sb);
 
 /* namei.c */
@@ -78,7 +85,7 @@
 extern void		   affs_put_inode(struct inode *);
 extern struct inode	  *affs_new_inode(const struct inode *dir);
 extern int		   affs_add_entry(struct inode *dir, struct inode *link, struct inode *inode,
-					  const char *name, int len, __s32 type);
+					  const char *name, int len, int type);
 
 /* file.c */
 
@@ -101,5 +108,4 @@
 extern struct inode_operations	 affs_blkdev_inode_operations;
 
 extern int init_affs_fs(void);
-
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this