diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 03:48:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 03:48:33 -0400 |
| commit | f70cac8d9c7125f83048f8b3d1c60f5a041a165c (patch) | |
| tree | 0d0efd72c1a41f973a919b16aac1d8210ed1ee30 /fs/ext4/inode.c | |
| parent | 4722cd7741c6404f967f7a7b8b666540b6c1663e (diff) | |
| parent | 08aab447c56a5388cf0c768da476ad022f00fef8 (diff) | |
Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stable
Diffstat (limited to 'fs/ext4/inode.c')
| -rw-r--r-- | fs/ext4/inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index c4da98a959ae..18d2558b7624 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -121,9 +121,6 @@ void ext4_evict_inode(struct inode *inode) | |||
| 121 | 121 | ||
| 122 | trace_ext4_evict_inode(inode); | 122 | trace_ext4_evict_inode(inode); |
| 123 | 123 | ||
| 124 | mutex_lock(&inode->i_mutex); | ||
| 125 | ext4_flush_completed_IO(inode); | ||
| 126 | mutex_unlock(&inode->i_mutex); | ||
| 127 | ext4_ioend_wait(inode); | 124 | ext4_ioend_wait(inode); |
| 128 | 125 | ||
| 129 | if (inode->i_nlink) { | 126 | if (inode->i_nlink) { |