git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
md: support bitmaps on RAID10 arrays larger then 2 terabytes
[safe/jmp/linux-2.6]
/
fs
/
fat
/
inode.c
diff --git
a/fs/fat/inode.c
b/fs/fat/inode.c
index
37a8af1
..
296785a
100644
(file)
--- a/
fs/fat/inode.c
+++ b/
fs/fat/inode.c
@@
-202,9
+202,9
@@
static sector_t _fat_bmap(struct address_space *mapping, sector_t block)
sector_t blocknr;
/* fat_get_cluster() assumes the requested blocknr isn't truncated. */
sector_t blocknr;
/* fat_get_cluster() assumes the requested blocknr isn't truncated. */
-
mutex_lock(&mapping->host->i_mutex
);
+
down_read(&mapping->host->i_alloc_sem
);
blocknr = generic_block_bmap(mapping, block, fat_get_block);
blocknr = generic_block_bmap(mapping, block, fat_get_block);
-
mutex_unlock(&mapping->host->i_mutex
);
+
up_read(&mapping->host->i_alloc_sem
);
return blocknr;
}
return blocknr;
}
@@
-523,7
+523,9
@@
static int fat_remount(struct super_block *sb, int *flags, char *data)
static int fat_statfs(struct dentry *dentry, struct kstatfs *buf)
{
static int fat_statfs(struct dentry *dentry, struct kstatfs *buf)
{
- struct msdos_sb_info *sbi = MSDOS_SB(dentry->d_sb);
+ struct super_block *sb = dentry->d_sb;
+ struct msdos_sb_info *sbi = MSDOS_SB(sb);
+ u64 id = huge_encode_dev(sb->s_bdev->bd_dev);
/* If the count of free cluster is still unknown, counts it here. */
if (sbi->free_clusters == -1 || !sbi->free_clus_valid) {
/* If the count of free cluster is still unknown, counts it here. */
if (sbi->free_clusters == -1 || !sbi->free_clus_valid) {
@@
-537,6
+539,8
@@
static int fat_statfs(struct dentry *dentry, struct kstatfs *buf)
buf->f_blocks = sbi->max_cluster - FAT_START_ENT;
buf->f_bfree = sbi->free_clusters;
buf->f_bavail = sbi->free_clusters;
buf->f_blocks = sbi->max_cluster - FAT_START_ENT;
buf->f_bfree = sbi->free_clusters;
buf->f_bavail = sbi->free_clusters;
+ buf->f_fsid.val[0] = (u32)id;
+ buf->f_fsid.val[1] = (u32)(id >> 32);
buf->f_namelen = sbi->options.isvfat ? 260 : 12;
return 0;
buf->f_namelen = sbi->options.isvfat ? 260 : 12;
return 0;
@@
-928,9
+932,9
@@
static int parse_options(char *options, int is_vfat, int silent, int *debug,
opts->isvfat = is_vfat;
opts->isvfat = is_vfat;
- opts->fs_uid = current
->uid
;
- opts->fs_gid = current
->gid
;
- opts->fs_fmask =
opts->fs_dmask = current->fs->umask
;
+ opts->fs_uid = current
_uid()
;
+ opts->fs_gid = current
_gid()
;
+ opts->fs_fmask =
current_umask()
;
opts->allow_utime = -1;
opts->codepage = fat_default_codepage;
opts->iocharset = fat_default_iocharset;
opts->allow_utime = -1;
opts->codepage = fat_default_codepage;
opts->iocharset = fat_default_iocharset;