diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 2 | ||||
| -rw-r--r-- | include/linux/msdos_fs.h | 19 | ||||
| -rw-r--r-- | include/linux/msdos_fs_sb.h | 5 |
3 files changed, 15 insertions, 11 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index fa14b066b2bb..f31cbc86c398 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -491,7 +491,7 @@ extern void blk_attempt_remerge(request_queue_t *, struct request *); extern void __blk_attempt_remerge(request_queue_t *, struct request *); extern struct request *blk_get_request(request_queue_t *, int, int); extern void blk_put_request(struct request *); -extern void blk_insert_request(request_queue_t *, struct request *, int, void *); +extern void blk_insert_request(request_queue_t *, struct request *, int, void *, int); extern void blk_requeue_request(request_queue_t *, struct request *); extern void blk_plug_device(request_queue_t *); extern int blk_remove_plug(request_queue_t *); diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h index 1ce9ba2f57b0..060549a87851 100644 --- a/include/linux/msdos_fs.h +++ b/include/linux/msdos_fs.h @@ -44,7 +44,7 @@ struct statfs; #define CASE_LOWER_EXT 16 /* extension is lower case */ #define DELETED_FLAG 0xe5 /* marks file as deleted when in name[0] */ -#define IS_FREE(n) (!*(n) || *(const unsigned char *) (n) == DELETED_FLAG) +#define IS_FREE(n) (!*(n) || *(n) == DELETED_FLAG) #define MSDOS_VALID_MODE (S_IFREG | S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO) /* valid file mode bits */ @@ -113,11 +113,11 @@ struct statfs; #define CT_LE_L(v) cpu_to_le32(v) struct fat_boot_sector { - __s8 ignored[3]; /* Boot strap short or near jump */ - __s8 system_id[8]; /* Name - can be used to special case + __u8 ignored[3]; /* Boot strap short or near jump */ + __u8 system_id[8]; /* Name - can be used to special case partition manager volumes */ __u8 sector_size[2]; /* bytes per logical sector */ - __u8 cluster_size; /* sectors/cluster */ + __u8 sec_per_clus; /* sectors/cluster */ __u16 reserved; /* reserved sectors */ __u8 fats; /* number of FATs */ __u8 dir_entries[2]; /* root directory entries */ @@ -149,7 +149,7 @@ struct fat_boot_fsinfo { }; struct msdos_dir_entry { - __s8 name[8],ext[3]; /* name and extension */ + __u8 name[8],ext[3]; /* name and extension */ __u8 attr; /* attribute bits */ __u8 lcase; /* Case for base and extension */ __u8 ctime_ms; /* Creation time, milliseconds */ @@ -237,12 +237,15 @@ extern void fat_cache_lookup(struct inode *inode, int cluster, int *f_clu, int *d_clu); extern void fat_cache_add(struct inode *inode, int f_clu, int d_clu); extern void fat_cache_inval_inode(struct inode *inode); +extern int fat_get_cluster(struct inode *inode, int cluster, + int *fclus, int *dclus); extern int fat_free(struct inode *inode, int skip); /* fat/dir.c */ extern struct file_operations fat_dir_operations; -extern int fat_search_long(struct inode *inode, const char *name, int name_len, - int anycase, loff_t *spos, loff_t *lpos); +extern int fat_search_long(struct inode *inode, const unsigned char *name, + int name_len, int anycase, + loff_t *spos, loff_t *lpos); extern int fat_readdir(struct file *filp, void *dirent, filldir_t filldir); extern int fat_dir_ioctl(struct inode * inode, struct file * filp, unsigned int cmd, unsigned long arg); @@ -302,7 +305,7 @@ static __inline__ int fat_get_entry(struct inode *dir, loff_t *pos, return fat__get_entry(dir, pos, bh, de, i_pos); } extern int fat_subdirs(struct inode *dir); -extern int fat_scan(struct inode *dir, const char *name, +extern int fat_scan(struct inode *dir, const unsigned char *name, struct buffer_head **res_bh, struct msdos_dir_entry **res_de, loff_t *i_pos); diff --git a/include/linux/msdos_fs_sb.h b/include/linux/msdos_fs_sb.h index 339fb5624943..546458d82ece 100644 --- a/include/linux/msdos_fs_sb.h +++ b/include/linux/msdos_fs_sb.h @@ -36,8 +36,9 @@ struct fat_cache { }; struct msdos_sb_info { - unsigned short cluster_size; /* sectors/cluster */ - unsigned short cluster_bits; /* sectors/cluster */ + unsigned short sec_per_clus; /* sectors/cluster */ + unsigned short cluster_bits; /* log2(cluster_size) */ + unsigned int cluster_size; /* cluster size */ unsigned char fats,fat_bits; /* number of FATs, FAT bits (12 or 16) */ unsigned short fat_start; unsigned long fat_length; /* FAT start & length (sec.) */ |