diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/inode.c | 3 | ||||
| -rw-r--r-- | fs/ext4/super.c | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 191616470466..846e1e9db434 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | static inline int ext4_begin_ordered_truncate(struct inode *inode, | 53 | static inline int ext4_begin_ordered_truncate(struct inode *inode, |
| 54 | loff_t new_size) | 54 | loff_t new_size) |
| 55 | { | 55 | { |
| 56 | trace_ext4_begin_ordered_truncate(inode, new_size); | ||
| 56 | return jbd2_journal_begin_ordered_truncate( | 57 | return jbd2_journal_begin_ordered_truncate( |
| 57 | EXT4_SB(inode->i_sb)->s_journal, | 58 | EXT4_SB(inode->i_sb)->s_journal, |
| 58 | &EXT4_I(inode)->jinode, | 59 | &EXT4_I(inode)->jinode, |
| @@ -178,6 +179,7 @@ void ext4_evict_inode(struct inode *inode) | |||
| 178 | handle_t *handle; | 179 | handle_t *handle; |
| 179 | int err; | 180 | int err; |
| 180 | 181 | ||
| 182 | trace_ext4_evict_inode(inode); | ||
| 181 | if (inode->i_nlink) { | 183 | if (inode->i_nlink) { |
| 182 | truncate_inode_pages(&inode->i_data, 0); | 184 | truncate_inode_pages(&inode->i_data, 0); |
| 183 | goto no_delete; | 185 | goto no_delete; |
| @@ -5649,6 +5651,7 @@ int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode) | |||
| 5649 | int err, ret; | 5651 | int err, ret; |
| 5650 | 5652 | ||
| 5651 | might_sleep(); | 5653 | might_sleep(); |
| 5654 | trace_ext4_mark_inode_dirty(inode, _RET_IP_); | ||
| 5652 | err = ext4_reserve_inode_write(handle, inode, &iloc); | 5655 | err = ext4_reserve_inode_write(handle, inode, &iloc); |
| 5653 | if (ext4_handle_valid(handle) && | 5656 | if (ext4_handle_valid(handle) && |
| 5654 | EXT4_I(inode)->i_extra_isize < sbi->s_want_extra_isize && | 5657 | EXT4_I(inode)->i_extra_isize < sbi->s_want_extra_isize && |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index ee91e29ddf95..61182fe6254e 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
| @@ -833,6 +833,14 @@ static struct inode *ext4_alloc_inode(struct super_block *sb) | |||
| 833 | return &ei->vfs_inode; | 833 | return &ei->vfs_inode; |
| 834 | } | 834 | } |
| 835 | 835 | ||
| 836 | static int ext4_drop_inode(struct inode *inode) | ||
| 837 | { | ||
| 838 | int drop = generic_drop_inode(inode); | ||
| 839 | |||
| 840 | trace_ext4_drop_inode(inode, drop); | ||
| 841 | return drop; | ||
| 842 | } | ||
| 843 | |||
| 836 | static void ext4_destroy_inode(struct inode *inode) | 844 | static void ext4_destroy_inode(struct inode *inode) |
| 837 | { | 845 | { |
| 838 | ext4_ioend_wait(inode); | 846 | ext4_ioend_wait(inode); |
| @@ -1175,6 +1183,7 @@ static const struct super_operations ext4_sops = { | |||
| 1175 | .destroy_inode = ext4_destroy_inode, | 1183 | .destroy_inode = ext4_destroy_inode, |
| 1176 | .write_inode = ext4_write_inode, | 1184 | .write_inode = ext4_write_inode, |
| 1177 | .dirty_inode = ext4_dirty_inode, | 1185 | .dirty_inode = ext4_dirty_inode, |
| 1186 | .drop_inode = ext4_drop_inode, | ||
| 1178 | .evict_inode = ext4_evict_inode, | 1187 | .evict_inode = ext4_evict_inode, |
| 1179 | .put_super = ext4_put_super, | 1188 | .put_super = ext4_put_super, |
| 1180 | .sync_fs = ext4_sync_fs, | 1189 | .sync_fs = ext4_sync_fs, |
| @@ -1196,6 +1205,7 @@ static const struct super_operations ext4_nojournal_sops = { | |||
| 1196 | .destroy_inode = ext4_destroy_inode, | 1205 | .destroy_inode = ext4_destroy_inode, |
| 1197 | .write_inode = ext4_write_inode, | 1206 | .write_inode = ext4_write_inode, |
| 1198 | .dirty_inode = ext4_dirty_inode, | 1207 | .dirty_inode = ext4_dirty_inode, |
| 1208 | .drop_inode = ext4_drop_inode, | ||
| 1199 | .evict_inode = ext4_evict_inode, | 1209 | .evict_inode = ext4_evict_inode, |
| 1200 | .write_super = ext4_write_super, | 1210 | .write_super = ext4_write_super, |
| 1201 | .put_super = ext4_put_super, | 1211 | .put_super = ext4_put_super, |
