diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 03:30:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 03:30:10 -0400 |
| commit | 5d13379a4dba717fb75b749acc0f928c2c02db17 (patch) | |
| tree | ab5bf870206e6ea8e744390cdb37cb14f7e78257 /fs/fat/fat.h | |
| parent | 08dc8726d4be85bca793141c827574fd32a681bb (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'fs/fat/fat.h')
| -rw-r--r-- | fs/fat/fat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fat/fat.h b/fs/fat/fat.h index adb0e72a176d..7db0979c6b72 100644 --- a/fs/fat/fat.h +++ b/fs/fat/fat.h | |||
| @@ -323,7 +323,7 @@ extern int fat_flush_inodes(struct super_block *sb, struct inode *i1, | |||
| 323 | /* fat/misc.c */ | 323 | /* fat/misc.c */ |
| 324 | extern void fat_fs_error(struct super_block *s, const char *fmt, ...) | 324 | extern void fat_fs_error(struct super_block *s, const char *fmt, ...) |
| 325 | __attribute__ ((format (printf, 2, 3))) __cold; | 325 | __attribute__ ((format (printf, 2, 3))) __cold; |
| 326 | extern void fat_clusters_flush(struct super_block *sb); | 326 | extern int fat_clusters_flush(struct super_block *sb); |
| 327 | extern int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster); | 327 | extern int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster); |
| 328 | extern void fat_time_fat2unix(struct msdos_sb_info *sbi, struct timespec *ts, | 328 | extern void fat_time_fat2unix(struct msdos_sb_info *sbi, struct timespec *ts, |
| 329 | __le16 __time, __le16 __date, u8 time_cs); | 329 | __le16 __time, __le16 __date, u8 time_cs); |