X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fadfs%2Fadfs.h;h=29217ff36d446a673dbabde26823b948aa6ce89b;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=6aed04ea538f5ab8c4038020a82e722dbb427cfc;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h index 6aed04ea5..29217ff36 100644 --- a/fs/adfs/adfs.h +++ b/fs/adfs/adfs.h @@ -12,7 +12,6 @@ #define ADFS_NDA_PUBLIC_READ (1 << 5) #define ADFS_NDA_PUBLIC_WRITE (1 << 6) -#include #include "dir_f.h" struct buffer_head; @@ -64,15 +63,9 @@ struct adfs_discmap { unsigned int dm_endbit; }; -/* dir stuff */ - - /* Inode stuff */ -int adfs_get_block(struct inode *inode, sector_t block, - struct buffer_head *bh, int create); struct inode *adfs_iget(struct super_block *sb, struct object_info *obj); -void adfs_read_inode(struct inode *inode); -void adfs_write_inode(struct inode *inode,int unused); +int adfs_write_inode(struct inode *inode,int unused); int adfs_notify_change(struct dentry *dentry, struct iattr *attr); /* map.c */ @@ -84,9 +77,6 @@ void __adfs_error(struct super_block *sb, const char *function, const char *fmt, ...); #define adfs_error(sb, fmt...) __adfs_error(sb, __FUNCTION__, fmt) -/* namei.c */ -extern struct dentry *adfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *); - /* super.c */ /* @@ -95,7 +85,7 @@ extern struct dentry *adfs_lookup(struct inode *dir, struct dentry *dentry, stru /* dir_*.c */ extern struct inode_operations adfs_dir_inode_operations; -extern struct file_operations adfs_dir_operations; +extern const struct file_operations adfs_dir_operations; extern struct dentry_operations adfs_dentry_operations; extern struct adfs_dir_ops adfs_f_dir_ops; extern struct adfs_dir_ops adfs_fplus_dir_ops; @@ -104,9 +94,9 @@ extern int adfs_dir_update(struct super_block *sb, struct object_info *obj); /* file.c */ extern struct inode_operations adfs_file_inode_operations; -extern struct file_operations adfs_file_operations; +extern const struct file_operations adfs_file_operations; -extern inline __u32 signed_asl(__u32 val, signed int shift) +static inline __u32 signed_asl(__u32 val, signed int shift) { if (shift >= 0) val <<= shift; @@ -121,7 +111,7 @@ extern inline __u32 signed_asl(__u32 val, signed int shift) * * The root directory ID should always be looked up in the map [3.4] */ -extern inline int +static inline int __adfs_block_map(struct super_block *sb, unsigned int object_id, unsigned int block) {