diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 6 | ||||
| -rw-r--r-- | include/linux/iso_fs.h | 2 | ||||
| -rw-r--r-- | include/linux/types.h | 10 |
3 files changed, 8 insertions, 10 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index fa03013be9d2..56771d8994b6 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -305,7 +305,7 @@ struct address_space_operations { int (*prepare_write)(struct file *, struct page *, unsigned, unsigned); int (*commit_write)(struct file *, struct page *, unsigned, unsigned); /* Unfortunately this kludge is needed for FIBMAP. Don't use it */ - int (*bmap)(struct address_space *, long); + sector_t (*bmap)(struct address_space *, sector_t); int (*invalidatepage) (struct page *, unsigned long); int (*releasepage) (struct page *, int); int (*direct_IO)(int, struct file *, const struct iovec *iov, @@ -356,7 +356,7 @@ struct block_device { int bd_holders; struct block_device * bd_contains; unsigned bd_block_size; - unsigned long bd_offset; + sector_t bd_offset; unsigned bd_part_count; int bd_invalidated; }; @@ -1141,7 +1141,7 @@ extern void write_inode_now(struct inode *, int); extern int filemap_fdatawrite(struct address_space *); extern int filemap_fdatawait(struct address_space *); extern void sync_supers(void); -extern int bmap(struct inode *, int); +extern sector_t bmap(struct inode *, sector_t); extern int notify_change(struct dentry *, struct iattr *); extern int permission(struct inode *, int); extern int vfs_permission(struct inode *, int); diff --git a/include/linux/iso_fs.h b/include/linux/iso_fs.h index 0ac0aa2334ea..8416bedc5c27 100644 --- a/include/linux/iso_fs.h +++ b/include/linux/iso_fs.h @@ -230,7 +230,7 @@ int get_joliet_filename(struct iso_directory_record *, unsigned char *, struct i int get_acorn_filename(struct iso_directory_record *, char *, struct inode *); extern struct dentry *isofs_lookup(struct inode *, struct dentry *); -extern struct buffer_head *isofs_bread(struct inode *, unsigned int); +extern struct buffer_head *isofs_bread(struct inode *, sector_t); extern int isofs_get_blocks(struct inode *, sector_t, struct buffer_head **, unsigned long); extern struct inode_operations isofs_dir_inode_operations; diff --git a/include/linux/types.h b/include/linux/types.h index 582d35492314..87985824b16e 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -117,13 +117,11 @@ typedef __s64 int64_t; #endif /* - * transition to 64-bit sector_t, possibly making it an option... + * The type used for indexing onto a disc or disc partition. + * If required, asm/types.h can override it and define + * HAVE_SECTOR_T */ -#undef BLK_64BIT_SECTOR - -#ifdef BLK_64BIT_SECTOR -typedef u64 sector_t; -#else +#ifndef HAVE_SECTOR_T typedef unsigned long sector_t; #endif |