diff options
Diffstat (limited to 'fs/ext4/migrate.c')
| -rw-r--r-- | fs/ext4/migrate.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c index 46fc0b5b12ba..f2a9cf498ecd 100644 --- a/fs/ext4/migrate.c +++ b/fs/ext4/migrate.c | |||
| @@ -447,8 +447,7 @@ static int free_ext_block(handle_t *handle, struct inode *inode) | |||
| 447 | 447 | ||
| 448 | } | 448 | } |
| 449 | 449 | ||
| 450 | int ext4_ext_migrate(struct inode *inode, struct file *filp, | 450 | int ext4_ext_migrate(struct inode *inode) |
| 451 | unsigned int cmd, unsigned long arg) | ||
| 452 | { | 451 | { |
| 453 | handle_t *handle; | 452 | handle_t *handle; |
| 454 | int retval = 0, i; | 453 | int retval = 0, i; |
| @@ -516,12 +515,6 @@ int ext4_ext_migrate(struct inode *inode, struct file *filp, | |||
| 516 | * when we add extents we extent the journal | 515 | * when we add extents we extent the journal |
| 517 | */ | 516 | */ |
| 518 | /* | 517 | /* |
| 519 | * inode_mutex prevent write and truncate on the file. Read still goes | ||
| 520 | * through. We take i_data_sem in ext4_ext_swap_inode_data before we | ||
| 521 | * switch the inode format to prevent read. | ||
| 522 | */ | ||
| 523 | mutex_lock(&(inode->i_mutex)); | ||
| 524 | /* | ||
| 525 | * Even though we take i_mutex we can still cause block allocation | 518 | * Even though we take i_mutex we can still cause block allocation |
| 526 | * via mmap write to holes. If we have allocated new blocks we fail | 519 | * via mmap write to holes. If we have allocated new blocks we fail |
| 527 | * migrate. New block allocation will clear EXT4_EXT_MIGRATE flag. | 520 | * migrate. New block allocation will clear EXT4_EXT_MIGRATE flag. |
| @@ -623,7 +616,6 @@ err_out: | |||
| 623 | tmp_inode->i_nlink = 0; | 616 | tmp_inode->i_nlink = 0; |
| 624 | 617 | ||
| 625 | ext4_journal_stop(handle); | 618 | ext4_journal_stop(handle); |
| 626 | mutex_unlock(&(inode->i_mutex)); | ||
| 627 | 619 | ||
| 628 | if (tmp_inode) | 620 | if (tmp_inode) |
| 629 | iput(tmp_inode); | 621 | iput(tmp_inode); |
