diff options
Diffstat (limited to 'fs/fat/inode.c')
-rw-r--r-- | fs/fat/inode.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index de0004fe6e00..296785a0dec8 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
@@ -523,7 +523,9 @@ static int fat_remount(struct super_block *sb, int *flags, char *data) | |||
523 | 523 | ||
524 | static int fat_statfs(struct dentry *dentry, struct kstatfs *buf) | 524 | static int fat_statfs(struct dentry *dentry, struct kstatfs *buf) |
525 | { | 525 | { |
526 | struct msdos_sb_info *sbi = MSDOS_SB(dentry->d_sb); | 526 | struct super_block *sb = dentry->d_sb; |
527 | struct msdos_sb_info *sbi = MSDOS_SB(sb); | ||
528 | u64 id = huge_encode_dev(sb->s_bdev->bd_dev); | ||
527 | 529 | ||
528 | /* If the count of free cluster is still unknown, counts it here. */ | 530 | /* If the count of free cluster is still unknown, counts it here. */ |
529 | if (sbi->free_clusters == -1 || !sbi->free_clus_valid) { | 531 | if (sbi->free_clusters == -1 || !sbi->free_clus_valid) { |
@@ -537,6 +539,8 @@ static int fat_statfs(struct dentry *dentry, struct kstatfs *buf) | |||
537 | buf->f_blocks = sbi->max_cluster - FAT_START_ENT; | 539 | buf->f_blocks = sbi->max_cluster - FAT_START_ENT; |
538 | buf->f_bfree = sbi->free_clusters; | 540 | buf->f_bfree = sbi->free_clusters; |
539 | buf->f_bavail = sbi->free_clusters; | 541 | buf->f_bavail = sbi->free_clusters; |
542 | buf->f_fsid.val[0] = (u32)id; | ||
543 | buf->f_fsid.val[1] = (u32)(id >> 32); | ||
540 | buf->f_namelen = sbi->options.isvfat ? 260 : 12; | 544 | buf->f_namelen = sbi->options.isvfat ? 260 : 12; |
541 | 545 | ||
542 | return 0; | 546 | return 0; |
@@ -930,7 +934,7 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug, | |||
930 | 934 | ||
931 | opts->fs_uid = current_uid(); | 935 | opts->fs_uid = current_uid(); |
932 | opts->fs_gid = current_gid(); | 936 | opts->fs_gid = current_gid(); |
933 | opts->fs_fmask = opts->fs_dmask = current->fs->umask; | 937 | opts->fs_fmask = current_umask(); |
934 | opts->allow_utime = -1; | 938 | opts->allow_utime = -1; |
935 | opts->codepage = fat_default_codepage; | 939 | opts->codepage = fat_default_codepage; |
936 | opts->iocharset = fat_default_iocharset; | 940 | opts->iocharset = fat_default_iocharset; |