diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-16 14:52:13 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-17 00:36:36 -0400 |
| commit | 608ba50bd0225d95469154feba8f00a6457848c1 (patch) | |
| tree | 1407a612c92301fb9ddf0bbef2afbc4d5b2e4597 /include/linux | |
| parent | ee450f796f6c4f3a563c914cb93ccfa91a1f7580 (diff) | |
Cleanup of adfs headers
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/adfs_fs.h | 13 | ||||
| -rw-r--r-- | include/linux/adfs_fs_i.h | 24 | ||||
| -rw-r--r-- | include/linux/adfs_fs_sb.h | 38 |
3 files changed, 0 insertions, 75 deletions
diff --git a/include/linux/adfs_fs.h b/include/linux/adfs_fs.h index ef788c2085a1..b19801f73890 100644 --- a/include/linux/adfs_fs.h +++ b/include/linux/adfs_fs.h | |||
| @@ -41,8 +41,6 @@ struct adfs_discrecord { | |||
| 41 | #define ADFS_DR_SIZE_BITS (ADFS_DR_SIZE << 3) | 41 | #define ADFS_DR_SIZE_BITS (ADFS_DR_SIZE << 3) |
| 42 | 42 | ||
| 43 | #ifdef __KERNEL__ | 43 | #ifdef __KERNEL__ |
| 44 | #include <linux/adfs_fs_i.h> | ||
| 45 | #include <linux/adfs_fs_sb.h> | ||
| 46 | /* | 44 | /* |
| 47 | * Calculate the boot block checksum on an ADFS drive. Note that this will | 45 | * Calculate the boot block checksum on an ADFS drive. Note that this will |
| 48 | * appear to be correct if the sector contains all zeros, so also check that | 46 | * appear to be correct if the sector contains all zeros, so also check that |
| @@ -60,17 +58,6 @@ static inline int adfs_checkbblk(unsigned char *ptr) | |||
| 60 | 58 | ||
| 61 | return (result & 0xff) != ptr[511]; | 59 | return (result & 0xff) != ptr[511]; |
| 62 | } | 60 | } |
| 63 | |||
| 64 | static inline struct adfs_sb_info *ADFS_SB(struct super_block *sb) | ||
| 65 | { | ||
| 66 | return sb->s_fs_info; | ||
| 67 | } | ||
| 68 | |||
| 69 | static inline struct adfs_inode_info *ADFS_I(struct inode *inode) | ||
| 70 | { | ||
| 71 | return container_of(inode, struct adfs_inode_info, vfs_inode); | ||
| 72 | } | ||
| 73 | |||
| 74 | #endif | 61 | #endif |
| 75 | 62 | ||
| 76 | #endif | 63 | #endif |
diff --git a/include/linux/adfs_fs_i.h b/include/linux/adfs_fs_i.h deleted file mode 100644 index cb543034e54f..000000000000 --- a/include/linux/adfs_fs_i.h +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/include/linux/adfs_fs_i.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 1997 Russell King | ||
| 5 | */ | ||
| 6 | |||
| 7 | #ifndef _ADFS_FS_I | ||
| 8 | #define _ADFS_FS_I | ||
| 9 | |||
| 10 | /* | ||
| 11 | * adfs file system inode data in memory | ||
| 12 | */ | ||
| 13 | struct adfs_inode_info { | ||
| 14 | loff_t mmu_private; | ||
| 15 | unsigned long parent_id; /* object id of parent */ | ||
| 16 | __u32 loadaddr; /* RISC OS load address */ | ||
| 17 | __u32 execaddr; /* RISC OS exec address */ | ||
| 18 | unsigned int filetype; /* RISC OS file type */ | ||
| 19 | unsigned int attr; /* RISC OS permissions */ | ||
| 20 | unsigned int stamped:1; /* RISC OS file has date/time */ | ||
| 21 | struct inode vfs_inode; | ||
| 22 | }; | ||
| 23 | |||
| 24 | #endif | ||
diff --git a/include/linux/adfs_fs_sb.h b/include/linux/adfs_fs_sb.h deleted file mode 100644 index d9bf05c02ccc..000000000000 --- a/include/linux/adfs_fs_sb.h +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/include/linux/adfs_fs_sb.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 1997-1999 Russell King | ||
| 5 | */ | ||
| 6 | |||
| 7 | #ifndef _ADFS_FS_SB | ||
| 8 | #define _ADFS_FS_SB | ||
| 9 | |||
| 10 | /* | ||
| 11 | * Forward-declare this | ||
| 12 | */ | ||
| 13 | struct adfs_discmap; | ||
| 14 | struct adfs_dir_ops; | ||
| 15 | |||
| 16 | /* | ||
| 17 | * ADFS file system superblock data in memory | ||
| 18 | */ | ||
| 19 | struct adfs_sb_info { | ||
| 20 | struct adfs_discmap *s_map; /* bh list containing map */ | ||
| 21 | struct adfs_dir_ops *s_dir; /* directory operations */ | ||
| 22 | |||
| 23 | uid_t s_uid; /* owner uid */ | ||
| 24 | gid_t s_gid; /* owner gid */ | ||
| 25 | umode_t s_owner_mask; /* ADFS owner perm -> unix perm */ | ||
| 26 | umode_t s_other_mask; /* ADFS other perm -> unix perm */ | ||
| 27 | |||
| 28 | __u32 s_ids_per_zone; /* max. no ids in one zone */ | ||
| 29 | __u32 s_idlen; /* length of ID in map */ | ||
| 30 | __u32 s_map_size; /* sector size of a map */ | ||
| 31 | unsigned long s_size; /* total size (in blocks) of this fs */ | ||
| 32 | signed int s_map2blk; /* shift left by this for map->sector */ | ||
| 33 | unsigned int s_log2sharesize;/* log2 share size */ | ||
| 34 | __le32 s_version; /* disc format version */ | ||
| 35 | unsigned int s_namelen; /* maximum number of characters in name */ | ||
| 36 | }; | ||
| 37 | |||
| 38 | #endif | ||
