Commit 58268691 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro

fat: remove i_alloc_sem abuse

Add a new rw_semaphore to protect bmap against truncate.  Previous
i_alloc_sem was abused for this, but it's going away in this series.

Note that we can't simply use i_mutex, given that the swapon code
calls ->bmap under it.
Signed-off-by: 's avatarChristoph Hellwig <>
Signed-off-by: 's avatarAl Viro <>
parent 8c5dc70a
......@@ -109,6 +109,7 @@ struct msdos_inode_info {
int i_attrs; /* unused attribute bits */
loff_t i_pos; /* on-disk position of directory entry or 0 */
struct hlist_node i_fat_hash; /* hash by i_location */
struct rw_semaphore truncate_lock; /* protect bmap against truncate */
struct inode vfs_inode;
......@@ -429,8 +429,10 @@ int fat_setattr(struct dentry *dentry, struct iattr *attr)
if (attr->ia_valid & ATTR_SIZE) {
truncate_setsize(inode, attr->ia_size);
fat_truncate_blocks(inode, attr->ia_size);
setattr_copy(inode, attr);
......@@ -224,9 +224,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. */
blocknr = generic_block_bmap(mapping, block, fat_get_block);
return blocknr;
......@@ -510,6 +510,8 @@ static struct inode *fat_alloc_inode(struct super_block *sb)
ei = kmem_cache_alloc(fat_inode_cachep, GFP_NOFS);
if (!ei)
return NULL;
return &ei->vfs_inode;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment