X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fadfs%2Fadfs.h;h=29217ff36d446a673dbabde26823b948aa6ce89b;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=63f5df9afb71f96c5e649fbb0f2c6cf3275513b6;hpb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;p=linux-2.6.git diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h index 63f5df9af..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; @@ -86,7 +85,7 @@ void __adfs_error(struct super_block *sb, const char *function, /* 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; @@ -95,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; @@ -112,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) {