Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
608ba50b
Commit
608ba50b
authored
Jun 16, 2009
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup of adfs headers
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
ee450f79
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
57 additions
and
134 deletions
+57
-134
fs/adfs/adfs.h
fs/adfs/adfs.h
+55
-0
fs/adfs/dir.c
fs/adfs/dir.c
+0
-8
fs/adfs/dir_f.c
fs/adfs/dir_f.c
+0
-8
fs/adfs/dir_fplus.c
fs/adfs/dir_fplus.c
+0
-8
fs/adfs/file.c
fs/adfs/file.c
+0
-4
fs/adfs/inode.c
fs/adfs/inode.c
+0
-10
fs/adfs/map.c
fs/adfs/map.c
+0
-6
fs/adfs/super.c
fs/adfs/super.c
+2
-15
include/linux/adfs_fs.h
include/linux/adfs_fs.h
+0
-13
include/linux/adfs_fs_i.h
include/linux/adfs_fs_i.h
+0
-24
include/linux/adfs_fs_sb.h
include/linux/adfs_fs_sb.h
+0
-38
No files found.
fs/adfs/adfs.h
View file @
608ba50b
#include <linux/fs.h>
#include <linux/adfs_fs.h>
/* Internal data structures for ADFS */
#define ADFS_FREE_FRAG 0
...
...
@@ -16,6 +19,58 @@
struct
buffer_head
;
/*
* adfs file system inode data in memory
*/
struct
adfs_inode_info
{
loff_t
mmu_private
;
unsigned
long
parent_id
;
/* object id of parent */
__u32
loadaddr
;
/* RISC OS load address */
__u32
execaddr
;
/* RISC OS exec address */
unsigned
int
filetype
;
/* RISC OS file type */
unsigned
int
attr
;
/* RISC OS permissions */
unsigned
int
stamped
:
1
;
/* RISC OS file has date/time */
struct
inode
vfs_inode
;
};
/*
* Forward-declare this
*/
struct
adfs_discmap
;
struct
adfs_dir_ops
;
/*
* ADFS file system superblock data in memory
*/
struct
adfs_sb_info
{
struct
adfs_discmap
*
s_map
;
/* bh list containing map */
struct
adfs_dir_ops
*
s_dir
;
/* directory operations */
uid_t
s_uid
;
/* owner uid */
gid_t
s_gid
;
/* owner gid */
umode_t
s_owner_mask
;
/* ADFS owner perm -> unix perm */
umode_t
s_other_mask
;
/* ADFS other perm -> unix perm */
__u32
s_ids_per_zone
;
/* max. no ids in one zone */
__u32
s_idlen
;
/* length of ID in map */
__u32
s_map_size
;
/* sector size of a map */
unsigned
long
s_size
;
/* total size (in blocks) of this fs */
signed
int
s_map2blk
;
/* shift left by this for map->sector */
unsigned
int
s_log2sharesize
;
/* log2 share size */
__le32
s_version
;
/* disc format version */
unsigned
int
s_namelen
;
/* maximum number of characters in name */
};
static
inline
struct
adfs_sb_info
*
ADFS_SB
(
struct
super_block
*
sb
)
{
return
sb
->
s_fs_info
;
}
static
inline
struct
adfs_inode_info
*
ADFS_I
(
struct
inode
*
inode
)
{
return
container_of
(
inode
,
struct
adfs_inode_info
,
vfs_inode
);
}
/*
* Directory handling
*/
...
...
fs/adfs/dir.c
View file @
608ba50b
...
...
@@ -9,15 +9,7 @@
*
* Common directory handling for ADFS
*/
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/adfs_fs.h>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/spinlock.h>
#include <linux/smp_lock.h>
#include <linux/buffer_head.h>
/* for file_fsync() */
#include "adfs.h"
/*
...
...
fs/adfs/dir_f.c
View file @
608ba50b
...
...
@@ -9,15 +9,7 @@
*
* E and F format directory handling
*/
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/adfs_fs.h>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/spinlock.h>
#include <linux/buffer_head.h>
#include <linux/string.h>
#include "adfs.h"
#include "dir_f.h"
...
...
fs/adfs/dir_fplus.c
View file @
608ba50b
...
...
@@ -7,15 +7,7 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/adfs_fs.h>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/spinlock.h>
#include <linux/buffer_head.h>
#include <linux/string.h>
#include "adfs.h"
#include "dir_fplus.h"
...
...
fs/adfs/file.c
View file @
608ba50b
...
...
@@ -19,10 +19,6 @@
*
* adfs regular file handling primitives
*/
#include <linux/fs.h>
#include <linux/buffer_head.h>
/* for file_fsync() */
#include <linux/adfs_fs.h>
#include "adfs.h"
const
struct
file_operations
adfs_file_operations
=
{
...
...
fs/adfs/inode.c
View file @
608ba50b
...
...
@@ -7,17 +7,8 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/adfs_fs.h>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/smp_lock.h>
#include <linux/module.h>
#include <linux/buffer_head.h>
#include "adfs.h"
/*
...
...
@@ -395,4 +386,3 @@ int adfs_write_inode(struct inode *inode, int wait)
unlock_kernel
();
return
ret
;
}
MODULE_LICENSE
(
"GPL"
);
fs/adfs/map.c
View file @
608ba50b
...
...
@@ -7,14 +7,8 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/adfs_fs.h>
#include <linux/spinlock.h>
#include <linux/buffer_head.h>
#include <asm/unaligned.h>
#include "adfs.h"
/*
...
...
fs/adfs/super.c
View file @
608ba50b
...
...
@@ -8,26 +8,12 @@
* published by the Free Software Foundation.
*/
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/adfs_fs.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/string.h>
#include <linux/init.h>
#include <linux/buffer_head.h>
#include <linux/vfs.h>
#include <linux/parser.h>
#include <linux/bitops.h>
#include <linux/mount.h>
#include <linux/seq_file.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <stdarg.h>
#include <linux/statfs.h>
#include "adfs.h"
#include "dir_f.h"
#include "dir_fplus.h"
...
...
@@ -534,3 +520,4 @@ static void __exit exit_adfs_fs(void)
module_init
(
init_adfs_fs
)
module_exit
(
exit_adfs_fs
)
MODULE_LICENSE
(
"GPL"
);
include/linux/adfs_fs.h
View file @
608ba50b
...
...
@@ -41,8 +41,6 @@ struct adfs_discrecord {
#define ADFS_DR_SIZE_BITS (ADFS_DR_SIZE << 3)
#ifdef __KERNEL__
#include <linux/adfs_fs_i.h>
#include <linux/adfs_fs_sb.h>
/*
* Calculate the boot block checksum on an ADFS drive. Note that this will
* 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)
return
(
result
&
0xff
)
!=
ptr
[
511
];
}
static
inline
struct
adfs_sb_info
*
ADFS_SB
(
struct
super_block
*
sb
)
{
return
sb
->
s_fs_info
;
}
static
inline
struct
adfs_inode_info
*
ADFS_I
(
struct
inode
*
inode
)
{
return
container_of
(
inode
,
struct
adfs_inode_info
,
vfs_inode
);
}
#endif
#endif
include/linux/adfs_fs_i.h
deleted
100644 → 0
View file @
ee450f79
/*
* linux/include/linux/adfs_fs_i.h
*
* Copyright (C) 1997 Russell King
*/
#ifndef _ADFS_FS_I
#define _ADFS_FS_I
/*
* adfs file system inode data in memory
*/
struct
adfs_inode_info
{
loff_t
mmu_private
;
unsigned
long
parent_id
;
/* object id of parent */
__u32
loadaddr
;
/* RISC OS load address */
__u32
execaddr
;
/* RISC OS exec address */
unsigned
int
filetype
;
/* RISC OS file type */
unsigned
int
attr
;
/* RISC OS permissions */
unsigned
int
stamped
:
1
;
/* RISC OS file has date/time */
struct
inode
vfs_inode
;
};
#endif
include/linux/adfs_fs_sb.h
deleted
100644 → 0
View file @
ee450f79
/*
* linux/include/linux/adfs_fs_sb.h
*
* Copyright (C) 1997-1999 Russell King
*/
#ifndef _ADFS_FS_SB
#define _ADFS_FS_SB
/*
* Forward-declare this
*/
struct
adfs_discmap
;
struct
adfs_dir_ops
;
/*
* ADFS file system superblock data in memory
*/
struct
adfs_sb_info
{
struct
adfs_discmap
*
s_map
;
/* bh list containing map */
struct
adfs_dir_ops
*
s_dir
;
/* directory operations */
uid_t
s_uid
;
/* owner uid */
gid_t
s_gid
;
/* owner gid */
umode_t
s_owner_mask
;
/* ADFS owner perm -> unix perm */
umode_t
s_other_mask
;
/* ADFS other perm -> unix perm */
__u32
s_ids_per_zone
;
/* max. no ids in one zone */
__u32
s_idlen
;
/* length of ID in map */
__u32
s_map_size
;
/* sector size of a map */
unsigned
long
s_size
;
/* total size (in blocks) of this fs */
signed
int
s_map2blk
;
/* shift left by this for map->sector */
unsigned
int
s_log2sharesize
;
/* log2 share size */
__le32
s_version
;
/* disc format version */
unsigned
int
s_namelen
;
/* maximum number of characters in name */
};
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment