diff options
Diffstat (limited to 'fs/ext4/inline.c')
-rw-r--r-- | fs/ext4/inline.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 82edf5b93352..645205d8ada6 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #define EXT4_INLINE_DOTDOT_OFFSET 2 | 22 | #define EXT4_INLINE_DOTDOT_OFFSET 2 |
23 | #define EXT4_INLINE_DOTDOT_SIZE 4 | 23 | #define EXT4_INLINE_DOTDOT_SIZE 4 |
24 | 24 | ||
25 | int ext4_get_inline_size(struct inode *inode) | 25 | static int ext4_get_inline_size(struct inode *inode) |
26 | { | 26 | { |
27 | if (EXT4_I(inode)->i_inline_off) | 27 | if (EXT4_I(inode)->i_inline_off) |
28 | return EXT4_I(inode)->i_inline_size; | 28 | return EXT4_I(inode)->i_inline_size; |
@@ -211,8 +211,8 @@ out: | |||
211 | * value since it is already handled by ext4_xattr_ibody_inline_set. | 211 | * value since it is already handled by ext4_xattr_ibody_inline_set. |
212 | * That saves us one memcpy. | 212 | * That saves us one memcpy. |
213 | */ | 213 | */ |
214 | void ext4_write_inline_data(struct inode *inode, struct ext4_iloc *iloc, | 214 | static void ext4_write_inline_data(struct inode *inode, struct ext4_iloc *iloc, |
215 | void *buffer, loff_t pos, unsigned int len) | 215 | void *buffer, loff_t pos, unsigned int len) |
216 | { | 216 | { |
217 | struct ext4_xattr_entry *entry; | 217 | struct ext4_xattr_entry *entry; |
218 | struct ext4_xattr_ibody_header *header; | 218 | struct ext4_xattr_ibody_header *header; |
@@ -264,6 +264,7 @@ static int ext4_create_inline_data(handle_t *handle, | |||
264 | if (error) | 264 | if (error) |
265 | return error; | 265 | return error; |
266 | 266 | ||
267 | BUFFER_TRACE(is.iloc.bh, "get_write_access"); | ||
267 | error = ext4_journal_get_write_access(handle, is.iloc.bh); | 268 | error = ext4_journal_get_write_access(handle, is.iloc.bh); |
268 | if (error) | 269 | if (error) |
269 | goto out; | 270 | goto out; |
@@ -347,6 +348,7 @@ static int ext4_update_inline_data(handle_t *handle, struct inode *inode, | |||
347 | if (error == -ENODATA) | 348 | if (error == -ENODATA) |
348 | goto out; | 349 | goto out; |
349 | 350 | ||
351 | BUFFER_TRACE(is.iloc.bh, "get_write_access"); | ||
350 | error = ext4_journal_get_write_access(handle, is.iloc.bh); | 352 | error = ext4_journal_get_write_access(handle, is.iloc.bh); |
351 | if (error) | 353 | if (error) |
352 | goto out; | 354 | goto out; |
@@ -373,8 +375,8 @@ out: | |||
373 | return error; | 375 | return error; |
374 | } | 376 | } |
375 | 377 | ||
376 | int ext4_prepare_inline_data(handle_t *handle, struct inode *inode, | 378 | static int ext4_prepare_inline_data(handle_t *handle, struct inode *inode, |
377 | unsigned int len) | 379 | unsigned int len) |
378 | { | 380 | { |
379 | int ret, size; | 381 | int ret, size; |
380 | struct ext4_inode_info *ei = EXT4_I(inode); | 382 | struct ext4_inode_info *ei = EXT4_I(inode); |
@@ -424,6 +426,7 @@ static int ext4_destroy_inline_data_nolock(handle_t *handle, | |||
424 | if (error) | 426 | if (error) |
425 | goto out; | 427 | goto out; |
426 | 428 | ||
429 | BUFFER_TRACE(is.iloc.bh, "get_write_access"); | ||
427 | error = ext4_journal_get_write_access(handle, is.iloc.bh); | 430 | error = ext4_journal_get_write_access(handle, is.iloc.bh); |
428 | if (error) | 431 | if (error) |
429 | goto out; | 432 | goto out; |
@@ -1007,6 +1010,7 @@ static int ext4_add_dirent_to_inline(handle_t *handle, | |||
1007 | if (err) | 1010 | if (err) |
1008 | return err; | 1011 | return err; |
1009 | 1012 | ||
1013 | BUFFER_TRACE(iloc->bh, "get_write_access"); | ||
1010 | err = ext4_journal_get_write_access(handle, iloc->bh); | 1014 | err = ext4_journal_get_write_access(handle, iloc->bh); |
1011 | if (err) | 1015 | if (err) |
1012 | return err; | 1016 | return err; |
@@ -1669,6 +1673,7 @@ int ext4_delete_inline_entry(handle_t *handle, | |||
1669 | EXT4_MIN_INLINE_DATA_SIZE; | 1673 | EXT4_MIN_INLINE_DATA_SIZE; |
1670 | } | 1674 | } |
1671 | 1675 | ||
1676 | BUFFER_TRACE(bh, "get_write_access"); | ||
1672 | err = ext4_journal_get_write_access(handle, bh); | 1677 | err = ext4_journal_get_write_access(handle, bh); |
1673 | if (err) | 1678 | if (err) |
1674 | goto out; | 1679 | goto out; |