diff --git a/[refs] b/[refs] index feb4be804606..42006762e442 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f27ecacc54cc0e5397c9b35f6c25065f07c4448d +refs/heads/master: e0c93142ceed0a2ea4f5b8e9d0f62c884241e9c0 diff --git a/trunk/fs/adfs/adfs.h b/trunk/fs/adfs/adfs.h index 63f5df9afb71..fd528433de43 100644 --- a/trunk/fs/adfs/adfs.h +++ b/trunk/fs/adfs/adfs.h @@ -97,7 +97,7 @@ extern int adfs_dir_update(struct super_block *sb, struct object_info *obj); extern struct inode_operations adfs_file_inode_operations; extern 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 +112,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) {