diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/inode.c | 2 | ||||
| -rw-r--r-- | fs/logfs/logfs.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 191616470466..4d78342f3bf0 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -5410,9 +5410,7 @@ int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry, | |||
| 5410 | * will return the blocks that include the delayed allocation | 5410 | * will return the blocks that include the delayed allocation |
| 5411 | * blocks for this file. | 5411 | * blocks for this file. |
| 5412 | */ | 5412 | */ |
| 5413 | spin_lock(&EXT4_I(inode)->i_block_reservation_lock); | ||
| 5414 | delalloc_blocks = EXT4_I(inode)->i_reserved_data_blocks; | 5413 | delalloc_blocks = EXT4_I(inode)->i_reserved_data_blocks; |
| 5415 | spin_unlock(&EXT4_I(inode)->i_block_reservation_lock); | ||
| 5416 | 5414 | ||
| 5417 | stat->blocks += (delalloc_blocks << inode->i_sb->s_blocksize_bits)>>9; | 5415 | stat->blocks += (delalloc_blocks << inode->i_sb->s_blocksize_bits)>>9; |
| 5418 | return 0; | 5416 | return 0; |
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h index cd51a36b37f0..57afd4a6fabb 100644 --- a/fs/logfs/logfs.h +++ b/fs/logfs/logfs.h | |||
| @@ -486,7 +486,7 @@ static inline int logfs_get_sb_bdev(struct logfs_super *s, | |||
| 486 | 486 | ||
| 487 | /* dev_mtd.c */ | 487 | /* dev_mtd.c */ |
| 488 | #ifdef CONFIG_MTD | 488 | #ifdef CONFIG_MTD |
| 489 | int logfs_get_sb_mtd(struct logfs_super *s, int mtdnr) | 489 | int logfs_get_sb_mtd(struct logfs_super *s, int mtdnr); |
| 490 | #else | 490 | #else |
| 491 | static inline int logfs_get_sb_mtd(struct logfs_super *s, int mtdnr) | 491 | static inline int logfs_get_sb_mtd(struct logfs_super *s, int mtdnr) |
| 492 | { | 492 | { |
