mirror of https://github.com/OpenIPC/firmware.git
104 lines
3.0 KiB
Diff
104 lines
3.0 KiB
Diff
diff -drupN a/fs/ext4/inline.c b/fs/ext4/inline.c
|
|
--- a/fs/ext4/inline.c 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/fs/ext4/inline.c 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -18,6 +18,7 @@
|
|
#include "ext4.h"
|
|
#include "xattr.h"
|
|
#include "truncate.h"
|
|
+#include <trace/events/android_fs.h>
|
|
|
|
#define EXT4_XATTR_SYSTEM_DATA "data"
|
|
#define EXT4_MIN_INLINE_DATA_SIZE ((sizeof(__le32) * EXT4_N_BLOCKS))
|
|
@@ -502,6 +503,17 @@ int ext4_readpage_inline(struct inode *i
|
|
return -EAGAIN;
|
|
}
|
|
|
|
+ if (trace_android_fs_dataread_start_enabled()) {
|
|
+ char *path, pathbuf[MAX_TRACE_PATHBUF_LEN];
|
|
+
|
|
+ path = android_fstrace_get_pathname(pathbuf,
|
|
+ MAX_TRACE_PATHBUF_LEN,
|
|
+ inode);
|
|
+ trace_android_fs_dataread_start(inode, page_offset(page),
|
|
+ PAGE_SIZE, current->pid,
|
|
+ path, current->comm);
|
|
+ }
|
|
+
|
|
/*
|
|
* Current inline data can only exist in the 1st page,
|
|
* So for all the other pages, just set them uptodate.
|
|
@@ -513,6 +525,8 @@ int ext4_readpage_inline(struct inode *i
|
|
SetPageUptodate(page);
|
|
}
|
|
|
|
+ trace_android_fs_dataread_end(inode, page_offset(page), PAGE_SIZE);
|
|
+
|
|
up_read(&EXT4_I(inode)->xattr_sem);
|
|
|
|
unlock_page(page);
|
|
@@ -889,11 +903,11 @@ retry_journal:
|
|
flags |= AOP_FLAG_NOFS;
|
|
|
|
if (ret == -ENOSPC) {
|
|
+ ext4_journal_stop(handle);
|
|
ret = ext4_da_convert_inline_data_to_extent(mapping,
|
|
inode,
|
|
flags,
|
|
fsdata);
|
|
- ext4_journal_stop(handle);
|
|
if (ret == -ENOSPC &&
|
|
ext4_should_retry_alloc(inode->i_sb, &retries))
|
|
goto retry_journal;
|
|
@@ -1025,7 +1039,7 @@ static int ext4_add_dirent_to_inline(han
|
|
err = ext4_journal_get_write_access(handle, iloc->bh);
|
|
if (err)
|
|
return err;
|
|
- ext4_insert_dentry(dir, inode, de, inline_size, fname);
|
|
+ ext4_insert_dentry(inode, de, inline_size, fname);
|
|
|
|
ext4_show_inline_dir(dir, iloc->bh, inline_start, inline_size);
|
|
|
|
@@ -1863,42 +1877,6 @@ out:
|
|
return (error < 0 ? error : 0);
|
|
}
|
|
|
|
-/*
|
|
- * Called during xattr set, and if we can sparse space 'needed',
|
|
- * just create the extent tree evict the data to the outer block.
|
|
- *
|
|
- * We use jbd2 instead of page cache to move data to the 1st block
|
|
- * so that the whole transaction can be committed as a whole and
|
|
- * the data isn't lost because of the delayed page cache write.
|
|
- */
|
|
-int ext4_try_to_evict_inline_data(handle_t *handle,
|
|
- struct inode *inode,
|
|
- int needed)
|
|
-{
|
|
- int error;
|
|
- struct ext4_xattr_entry *entry;
|
|
- struct ext4_inode *raw_inode;
|
|
- struct ext4_iloc iloc;
|
|
-
|
|
- error = ext4_get_inode_loc(inode, &iloc);
|
|
- if (error)
|
|
- return error;
|
|
-
|
|
- raw_inode = ext4_raw_inode(&iloc);
|
|
- entry = (struct ext4_xattr_entry *)((void *)raw_inode +
|
|
- EXT4_I(inode)->i_inline_off);
|
|
- if (EXT4_XATTR_LEN(entry->e_name_len) +
|
|
- EXT4_XATTR_SIZE(le32_to_cpu(entry->e_value_size)) < needed) {
|
|
- error = -ENOSPC;
|
|
- goto out;
|
|
- }
|
|
-
|
|
- error = ext4_convert_inline_data_nolock(handle, inode, &iloc);
|
|
-out:
|
|
- brelse(iloc.bh);
|
|
- return error;
|
|
-}
|
|
-
|
|
void ext4_inline_data_truncate(struct inode *inode, int *has_inline)
|
|
{
|
|
handle_t *handle;
|