commit 6ba0e7dc64a5 ("jbd2: introduce jbd2_inode dirty range scoping")
allow us scoping each of the inode dirty ranges associated with a given
transaction, and ext4 already does this way.
Now let's also use the newly introduced jbd2_inode dirty range scoping
to prevent us from waiting forever when trying to complete a journal
transaction in ocfs2.
Signed-off-by: Joseph Qi <[email protected]>
Reviewed-by: Ross Zwisler <[email protected]>
---
v1 -> v2:
rename ocfs2_jbd2_file_inode() to ocfs2_jbd2_inode_add_write() to keep
consistent with ext4.
wrap several long lines.
fs/ocfs2/alloc.c | 5 ++++-
fs/ocfs2/aops.c | 13 ++++++++++---
fs/ocfs2/file.c | 10 +++++++---
fs/ocfs2/journal.h | 11 +++++++----
4 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index d1348fc..54f72ad 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -6792,6 +6792,8 @@ void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,
struct page *page, int zero, u64 *phys)
{
int ret, partial = 0;
+ loff_t start_byte = ((loff_t)page->index << PAGE_SHIFT) + from;
+ loff_t length = to - from;
ret = ocfs2_map_page_blocks(page, phys, inode, from, to, 0);
if (ret)
@@ -6811,7 +6813,8 @@ void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,
if (ret < 0)
mlog_errno(ret);
else if (ocfs2_should_order_data(inode)) {
- ret = ocfs2_jbd2_file_inode(handle, inode);
+ ret = ocfs2_jbd2_inode_add_write(handle, inode,
+ start_byte, length);
if (ret < 0)
mlog_errno(ret);
}
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index a4c905d..8de1c9d 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -942,7 +942,8 @@ static void ocfs2_write_failure(struct inode *inode,
if (tmppage && page_has_buffers(tmppage)) {
if (ocfs2_should_order_data(inode))
- ocfs2_jbd2_file_inode(wc->w_handle, inode);
+ ocfs2_jbd2_inode_add_write(wc->w_handle, inode,
+ user_pos, user_len);
block_commit_write(tmppage, from, to);
}
@@ -2023,8 +2024,14 @@ int ocfs2_write_end_nolock(struct address_space *mapping,
}
if (page_has_buffers(tmppage)) {
- if (handle && ocfs2_should_order_data(inode))
- ocfs2_jbd2_file_inode(handle, inode);
+ if (handle && ocfs2_should_order_data(inode)) {
+ loff_t start_byte =
+ ((loff_t)tmppage->index << PAGE_SHIFT) +
+ from;
+ loff_t length = to - from;
+ ocfs2_jbd2_inode_add_write(handle, inode,
+ start_byte, length);
+ }
block_commit_write(tmppage, from, to);
}
}
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 4435df3..efe9988 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -706,7 +706,9 @@ static int ocfs2_extend_allocation(struct inode *inode, u32 logical_start,
* Thus, we need to explicitly order the zeroed pages.
*/
static handle_t *ocfs2_zero_start_ordered_transaction(struct inode *inode,
- struct buffer_head *di_bh)
+ struct buffer_head *di_bh,
+ loff_t start_byte,
+ loff_t length)
{
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
handle_t *handle = NULL;
@@ -722,7 +724,7 @@ static handle_t *ocfs2_zero_start_ordered_transaction(struct inode *inode,
goto out;
}
- ret = ocfs2_jbd2_file_inode(handle, inode);
+ ret = ocfs2_jbd2_inode_add_write(handle, inode, start_byte, length);
if (ret < 0) {
mlog_errno(ret);
goto out;
@@ -761,7 +763,9 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
BUG_ON(abs_to > (((u64)index + 1) << PAGE_SHIFT));
BUG_ON(abs_from & (inode->i_blkbits - 1));
- handle = ocfs2_zero_start_ordered_transaction(inode, di_bh);
+ handle = ocfs2_zero_start_ordered_transaction(inode, di_bh,
+ abs_from,
+ abs_to - abs_from);
if (IS_ERR(handle)) {
ret = PTR_ERR(handle);
goto out;
diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h
index c0fe6ed..f37473c 100644
--- a/fs/ocfs2/journal.h
+++ b/fs/ocfs2/journal.h
@@ -232,8 +232,8 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode)
* ocfs2_journal_access_*() unless you intend to
* manage the checksum by hand.
* ocfs2_journal_dirty - Mark a journalled buffer as having dirty data.
- * ocfs2_jbd2_file_inode - Mark an inode so that its data goes out before
- * the current handle commits.
+ * ocfs2_jbd2_inode_add_write - Mark an inode with range so that its data goes
+ * out before the current handle commits.
*/
/* You must always start_trans with a number of buffs > 0, but it's
@@ -603,9 +603,12 @@ static inline int ocfs2_calc_tree_trunc_credits(struct super_block *sb,
return credits;
}
-static inline int ocfs2_jbd2_file_inode(handle_t *handle, struct inode *inode)
+static inline int ocfs2_jbd2_inode_add_write(handle_t *handle, struct inode *inode,
+ loff_t start_byte, loff_t length)
{
- return jbd2_journal_inode_add_write(handle, &OCFS2_I(inode)->ip_jinode);
+ return jbd2_journal_inode_ranged_write(handle,
+ &OCFS2_I(inode)->ip_jinode,
+ start_byte, length);
}
static inline int ocfs2_begin_ordered_truncate(struct inode *inode,
--
1.8.3.1
Since ext4/ocfs2 are using jbd2_inode dirty range scoping APIs now,
jbd2_journal_inode_add_[write|wait] are not used any more, remove them.
Signed-off-by: Joseph Qi <[email protected]>
Reviewed-by: Ross Zwisler <[email protected]>
---
fs/jbd2/journal.c | 2 --
fs/jbd2/transaction.c | 12 ------------
include/linux/jbd2.h | 2 --
3 files changed, 16 deletions(-)
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 953990e..1c58859 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -89,8 +89,6 @@
EXPORT_SYMBOL(jbd2_journal_invalidatepage);
EXPORT_SYMBOL(jbd2_journal_try_to_free_buffers);
EXPORT_SYMBOL(jbd2_journal_force_commit);
-EXPORT_SYMBOL(jbd2_journal_inode_add_write);
-EXPORT_SYMBOL(jbd2_journal_inode_add_wait);
EXPORT_SYMBOL(jbd2_journal_inode_ranged_write);
EXPORT_SYMBOL(jbd2_journal_inode_ranged_wait);
EXPORT_SYMBOL(jbd2_journal_init_jbd_inode);
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 990e7b5..9bf793d 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -2619,18 +2619,6 @@ static int jbd2_journal_file_inode(handle_t *handle, struct jbd2_inode *jinode,
return 0;
}
-int jbd2_journal_inode_add_write(handle_t *handle, struct jbd2_inode *jinode)
-{
- return jbd2_journal_file_inode(handle, jinode,
- JI_WRITE_DATA | JI_WAIT_DATA, 0, LLONG_MAX);
-}
-
-int jbd2_journal_inode_add_wait(handle_t *handle, struct jbd2_inode *jinode)
-{
- return jbd2_journal_file_inode(handle, jinode, JI_WAIT_DATA, 0,
- LLONG_MAX);
-}
-
int jbd2_journal_inode_ranged_write(handle_t *handle,
struct jbd2_inode *jinode, loff_t start_byte, loff_t length)
{
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index df03825..603fbc4 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -1410,8 +1410,6 @@ extern int jbd2_journal_update_sb_log_tail (journal_t *, tid_t,
extern int jbd2_journal_bmap(journal_t *, unsigned long, unsigned long long *);
extern int jbd2_journal_force_commit(journal_t *);
extern int jbd2_journal_force_commit_nested(journal_t *);
-extern int jbd2_journal_inode_add_write(handle_t *handle, struct jbd2_inode *inode);
-extern int jbd2_journal_inode_add_wait(handle_t *handle, struct jbd2_inode *inode);
extern int jbd2_journal_inode_ranged_write(handle_t *handle,
struct jbd2_inode *inode, loff_t start_byte,
loff_t length);
--
1.8.3.1
Looks good to me.
On 2019/7/13 8:26 上午, Joseph Qi wrote:
> commit 6ba0e7dc64a5 ("jbd2: introduce jbd2_inode dirty range scoping")
> allow us scoping each of the inode dirty ranges associated with a given
> transaction, and ext4 already does this way.
> Now let's also use the newly introduced jbd2_inode dirty range scoping
> to prevent us from waiting forever when trying to complete a journal
> transaction in ocfs2.
>
> Signed-off-by: Joseph Qi <[email protected]>
> Reviewed-by: Ross Zwisler <[email protected]>
Reviewed-by: Changwei Ge <[email protected]>
> ---
> v1 -> v2:
> rename ocfs2_jbd2_file_inode() to ocfs2_jbd2_inode_add_write() to keep
> consistent with ext4.
> wrap several long lines.
>
> fs/ocfs2/alloc.c | 5 ++++-
> fs/ocfs2/aops.c | 13 ++++++++++---
> fs/ocfs2/file.c | 10 +++++++---
> fs/ocfs2/journal.h | 11 +++++++----
> 4 files changed, 28 insertions(+), 11 deletions(-)
>
> diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
> index d1348fc..54f72ad 100644
> --- a/fs/ocfs2/alloc.c
> +++ b/fs/ocfs2/alloc.c
> @@ -6792,6 +6792,8 @@ void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,
> struct page *page, int zero, u64 *phys)
> {
> int ret, partial = 0;
> + loff_t start_byte = ((loff_t)page->index << PAGE_SHIFT) + from;
> + loff_t length = to - from;
>
> ret = ocfs2_map_page_blocks(page, phys, inode, from, to, 0);
> if (ret)
> @@ -6811,7 +6813,8 @@ void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,
> if (ret < 0)
> mlog_errno(ret);
> else if (ocfs2_should_order_data(inode)) {
> - ret = ocfs2_jbd2_file_inode(handle, inode);
> + ret = ocfs2_jbd2_inode_add_write(handle, inode,
> + start_byte, length);
> if (ret < 0)
> mlog_errno(ret);
> }
> diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
> index a4c905d..8de1c9d 100644
> --- a/fs/ocfs2/aops.c
> +++ b/fs/ocfs2/aops.c
> @@ -942,7 +942,8 @@ static void ocfs2_write_failure(struct inode *inode,
>
> if (tmppage && page_has_buffers(tmppage)) {
> if (ocfs2_should_order_data(inode))
> - ocfs2_jbd2_file_inode(wc->w_handle, inode);
> + ocfs2_jbd2_inode_add_write(wc->w_handle, inode,
> + user_pos, user_len);
>
> block_commit_write(tmppage, from, to);
> }
> @@ -2023,8 +2024,14 @@ int ocfs2_write_end_nolock(struct address_space *mapping,
> }
>
> if (page_has_buffers(tmppage)) {
> - if (handle && ocfs2_should_order_data(inode))
> - ocfs2_jbd2_file_inode(handle, inode);
> + if (handle && ocfs2_should_order_data(inode)) {
> + loff_t start_byte =
> + ((loff_t)tmppage->index << PAGE_SHIFT) +
> + from;
> + loff_t length = to - from;
> + ocfs2_jbd2_inode_add_write(handle, inode,
> + start_byte, length);
> + }
> block_commit_write(tmppage, from, to);
> }
> }
> diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
> index 4435df3..efe9988 100644
> --- a/fs/ocfs2/file.c
> +++ b/fs/ocfs2/file.c
> @@ -706,7 +706,9 @@ static int ocfs2_extend_allocation(struct inode *inode, u32 logical_start,
> * Thus, we need to explicitly order the zeroed pages.
> */
> static handle_t *ocfs2_zero_start_ordered_transaction(struct inode *inode,
> - struct buffer_head *di_bh)
> + struct buffer_head *di_bh,
> + loff_t start_byte,
> + loff_t length)
> {
> struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
> handle_t *handle = NULL;
> @@ -722,7 +724,7 @@ static handle_t *ocfs2_zero_start_ordered_transaction(struct inode *inode,
> goto out;
> }
>
> - ret = ocfs2_jbd2_file_inode(handle, inode);
> + ret = ocfs2_jbd2_inode_add_write(handle, inode, start_byte, length);
> if (ret < 0) {
> mlog_errno(ret);
> goto out;
> @@ -761,7 +763,9 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
> BUG_ON(abs_to > (((u64)index + 1) << PAGE_SHIFT));
> BUG_ON(abs_from & (inode->i_blkbits - 1));
>
> - handle = ocfs2_zero_start_ordered_transaction(inode, di_bh);
> + handle = ocfs2_zero_start_ordered_transaction(inode, di_bh,
> + abs_from,
> + abs_to - abs_from);
> if (IS_ERR(handle)) {
> ret = PTR_ERR(handle);
> goto out;
> diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h
> index c0fe6ed..f37473c 100644
> --- a/fs/ocfs2/journal.h
> +++ b/fs/ocfs2/journal.h
> @@ -232,8 +232,8 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode)
> * ocfs2_journal_access_*() unless you intend to
> * manage the checksum by hand.
> * ocfs2_journal_dirty - Mark a journalled buffer as having dirty data.
> - * ocfs2_jbd2_file_inode - Mark an inode so that its data goes out before
> - * the current handle commits.
> + * ocfs2_jbd2_inode_add_write - Mark an inode with range so that its data goes
> + * out before the current handle commits.
> */
>
> /* You must always start_trans with a number of buffs > 0, but it's
> @@ -603,9 +603,12 @@ static inline int ocfs2_calc_tree_trunc_credits(struct super_block *sb,
> return credits;
> }
>
> -static inline int ocfs2_jbd2_file_inode(handle_t *handle, struct inode *inode)
> +static inline int ocfs2_jbd2_inode_add_write(handle_t *handle, struct inode *inode,
> + loff_t start_byte, loff_t length)
> {
> - return jbd2_journal_inode_add_write(handle, &OCFS2_I(inode)->ip_jinode);
> + return jbd2_journal_inode_ranged_write(handle,
> + &OCFS2_I(inode)->ip_jinode,
> + start_byte, length);
> }
>
> static inline int ocfs2_begin_ordered_truncate(struct inode *inode,
On 2019/7/13 8:26 上午, Joseph Qi wrote:
> Since ext4/ocfs2 are using jbd2_inode dirty range scoping APIs now,
> jbd2_journal_inode_add_[write|wait] are not used any more, remove them.
>
> Signed-off-by: Joseph Qi <[email protected]>
> Reviewed-by: Ross Zwisler <[email protected]>
Acked-by: Changwei Ge <[email protected]>
> ---
> fs/jbd2/journal.c | 2 --
> fs/jbd2/transaction.c | 12 ------------
> include/linux/jbd2.h | 2 --
> 3 files changed, 16 deletions(-)
>
> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> index 953990e..1c58859 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -89,8 +89,6 @@
> EXPORT_SYMBOL(jbd2_journal_invalidatepage);
> EXPORT_SYMBOL(jbd2_journal_try_to_free_buffers);
> EXPORT_SYMBOL(jbd2_journal_force_commit);
> -EXPORT_SYMBOL(jbd2_journal_inode_add_write);
> -EXPORT_SYMBOL(jbd2_journal_inode_add_wait);
> EXPORT_SYMBOL(jbd2_journal_inode_ranged_write);
> EXPORT_SYMBOL(jbd2_journal_inode_ranged_wait);
> EXPORT_SYMBOL(jbd2_journal_init_jbd_inode);
> diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
> index 990e7b5..9bf793d 100644
> --- a/fs/jbd2/transaction.c
> +++ b/fs/jbd2/transaction.c
> @@ -2619,18 +2619,6 @@ static int jbd2_journal_file_inode(handle_t *handle, struct jbd2_inode *jinode,
> return 0;
> }
>
> -int jbd2_journal_inode_add_write(handle_t *handle, struct jbd2_inode *jinode)
> -{
> - return jbd2_journal_file_inode(handle, jinode,
> - JI_WRITE_DATA | JI_WAIT_DATA, 0, LLONG_MAX);
> -}
> -
> -int jbd2_journal_inode_add_wait(handle_t *handle, struct jbd2_inode *jinode)
> -{
> - return jbd2_journal_file_inode(handle, jinode, JI_WAIT_DATA, 0,
> - LLONG_MAX);
> -}
> -
> int jbd2_journal_inode_ranged_write(handle_t *handle,
> struct jbd2_inode *jinode, loff_t start_byte, loff_t length)
> {
> diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
> index df03825..603fbc4 100644
> --- a/include/linux/jbd2.h
> +++ b/include/linux/jbd2.h
> @@ -1410,8 +1410,6 @@ extern int jbd2_journal_update_sb_log_tail (journal_t *, tid_t,
> extern int jbd2_journal_bmap(journal_t *, unsigned long, unsigned long long *);
> extern int jbd2_journal_force_commit(journal_t *);
> extern int jbd2_journal_force_commit_nested(journal_t *);
> -extern int jbd2_journal_inode_add_write(handle_t *handle, struct jbd2_inode *inode);
> -extern int jbd2_journal_inode_add_wait(handle_t *handle, struct jbd2_inode *inode);
> extern int jbd2_journal_inode_ranged_write(handle_t *handle,
> struct jbd2_inode *inode, loff_t start_byte,
> loff_t length);
Hi Andrew,
Could you please pick up these 2 patches?
Thanks,
Joseph
On 19/7/13 08:26, Joseph Qi wrote:
> commit 6ba0e7dc64a5 ("jbd2: introduce jbd2_inode dirty range scoping")
> allow us scoping each of the inode dirty ranges associated with a given
> transaction, and ext4 already does this way.
> Now let's also use the newly introduced jbd2_inode dirty range scoping
> to prevent us from waiting forever when trying to complete a journal
> transaction in ocfs2.
>
> Signed-off-by: Joseph Qi <[email protected]>
> Reviewed-by: Ross Zwisler <[email protected]>
> ---
> v1 -> v2:
> rename ocfs2_jbd2_file_inode() to ocfs2_jbd2_inode_add_write() to keep
> consistent with ext4.
> wrap several long lines.
>
> fs/ocfs2/alloc.c | 5 ++++-
> fs/ocfs2/aops.c | 13 ++++++++++---
> fs/ocfs2/file.c | 10 +++++++---
> fs/ocfs2/journal.h | 11 +++++++----
> 4 files changed, 28 insertions(+), 11 deletions(-)
>
> diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
> index d1348fc..54f72ad 100644
> --- a/fs/ocfs2/alloc.c
> +++ b/fs/ocfs2/alloc.c
> @@ -6792,6 +6792,8 @@ void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,
> struct page *page, int zero, u64 *phys)
> {
> int ret, partial = 0;
> + loff_t start_byte = ((loff_t)page->index << PAGE_SHIFT) + from;
> + loff_t length = to - from;
>
> ret = ocfs2_map_page_blocks(page, phys, inode, from, to, 0);
> if (ret)
> @@ -6811,7 +6813,8 @@ void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,
> if (ret < 0)
> mlog_errno(ret);
> else if (ocfs2_should_order_data(inode)) {
> - ret = ocfs2_jbd2_file_inode(handle, inode);
> + ret = ocfs2_jbd2_inode_add_write(handle, inode,
> + start_byte, length);
> if (ret < 0)
> mlog_errno(ret);
> }
> diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
> index a4c905d..8de1c9d 100644
> --- a/fs/ocfs2/aops.c
> +++ b/fs/ocfs2/aops.c
> @@ -942,7 +942,8 @@ static void ocfs2_write_failure(struct inode *inode,
>
> if (tmppage && page_has_buffers(tmppage)) {
> if (ocfs2_should_order_data(inode))
> - ocfs2_jbd2_file_inode(wc->w_handle, inode);
> + ocfs2_jbd2_inode_add_write(wc->w_handle, inode,
> + user_pos, user_len);
>
> block_commit_write(tmppage, from, to);
> }
> @@ -2023,8 +2024,14 @@ int ocfs2_write_end_nolock(struct address_space *mapping,
> }
>
> if (page_has_buffers(tmppage)) {
> - if (handle && ocfs2_should_order_data(inode))
> - ocfs2_jbd2_file_inode(handle, inode);
> + if (handle && ocfs2_should_order_data(inode)) {
> + loff_t start_byte =
> + ((loff_t)tmppage->index << PAGE_SHIFT) +
> + from;
> + loff_t length = to - from;
> + ocfs2_jbd2_inode_add_write(handle, inode,
> + start_byte, length);
> + }
> block_commit_write(tmppage, from, to);
> }
> }
> diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
> index 4435df3..efe9988 100644
> --- a/fs/ocfs2/file.c
> +++ b/fs/ocfs2/file.c
> @@ -706,7 +706,9 @@ static int ocfs2_extend_allocation(struct inode *inode, u32 logical_start,
> * Thus, we need to explicitly order the zeroed pages.
> */
> static handle_t *ocfs2_zero_start_ordered_transaction(struct inode *inode,
> - struct buffer_head *di_bh)
> + struct buffer_head *di_bh,
> + loff_t start_byte,
> + loff_t length)
> {
> struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
> handle_t *handle = NULL;
> @@ -722,7 +724,7 @@ static handle_t *ocfs2_zero_start_ordered_transaction(struct inode *inode,
> goto out;
> }
>
> - ret = ocfs2_jbd2_file_inode(handle, inode);
> + ret = ocfs2_jbd2_inode_add_write(handle, inode, start_byte, length);
> if (ret < 0) {
> mlog_errno(ret);
> goto out;
> @@ -761,7 +763,9 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
> BUG_ON(abs_to > (((u64)index + 1) << PAGE_SHIFT));
> BUG_ON(abs_from & (inode->i_blkbits - 1));
>
> - handle = ocfs2_zero_start_ordered_transaction(inode, di_bh);
> + handle = ocfs2_zero_start_ordered_transaction(inode, di_bh,
> + abs_from,
> + abs_to - abs_from);
> if (IS_ERR(handle)) {
> ret = PTR_ERR(handle);
> goto out;
> diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h
> index c0fe6ed..f37473c 100644
> --- a/fs/ocfs2/journal.h
> +++ b/fs/ocfs2/journal.h
> @@ -232,8 +232,8 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode)
> * ocfs2_journal_access_*() unless you intend to
> * manage the checksum by hand.
> * ocfs2_journal_dirty - Mark a journalled buffer as having dirty data.
> - * ocfs2_jbd2_file_inode - Mark an inode so that its data goes out before
> - * the current handle commits.
> + * ocfs2_jbd2_inode_add_write - Mark an inode with range so that its data goes
> + * out before the current handle commits.
> */
>
> /* You must always start_trans with a number of buffs > 0, but it's
> @@ -603,9 +603,12 @@ static inline int ocfs2_calc_tree_trunc_credits(struct super_block *sb,
> return credits;
> }
>
> -static inline int ocfs2_jbd2_file_inode(handle_t *handle, struct inode *inode)
> +static inline int ocfs2_jbd2_inode_add_write(handle_t *handle, struct inode *inode,
> + loff_t start_byte, loff_t length)
> {
> - return jbd2_journal_inode_add_write(handle, &OCFS2_I(inode)->ip_jinode);
> + return jbd2_journal_inode_ranged_write(handle,
> + &OCFS2_I(inode)->ip_jinode,
> + start_byte, length);
> }
>
> static inline int ocfs2_begin_ordered_truncate(struct inode *inode,
>
Ping...
If something else should be updated, please let me know.
Thanks,
Joseph
On 19/7/16 19:15, Joseph Qi wrote:
> Hi Andrew,
> Could you please pick up these 2 patches?
>
> Thanks,
> Joseph
>
> On 19/7/13 08:26, Joseph Qi wrote:
>> commit 6ba0e7dc64a5 ("jbd2: introduce jbd2_inode dirty range scoping")
>> allow us scoping each of the inode dirty ranges associated with a given
>> transaction, and ext4 already does this way.
>> Now let's also use the newly introduced jbd2_inode dirty range scoping
>> to prevent us from waiting forever when trying to complete a journal
>> transaction in ocfs2.
>>
>> Signed-off-by: Joseph Qi <[email protected]>
>> Reviewed-by: Ross Zwisler <[email protected]>
>> ---
>> v1 -> v2:
>> rename ocfs2_jbd2_file_inode() to ocfs2_jbd2_inode_add_write() to keep
>> consistent with ext4.
>> wrap several long lines.
>>
>> fs/ocfs2/alloc.c | 5 ++++-
>> fs/ocfs2/aops.c | 13 ++++++++++---
>> fs/ocfs2/file.c | 10 +++++++---
>> fs/ocfs2/journal.h | 11 +++++++----
>> 4 files changed, 28 insertions(+), 11 deletions(-)
>>
>> diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
>> index d1348fc..54f72ad 100644
>> --- a/fs/ocfs2/alloc.c
>> +++ b/fs/ocfs2/alloc.c
>> @@ -6792,6 +6792,8 @@ void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,
>> struct page *page, int zero, u64 *phys)
>> {
>> int ret, partial = 0;
>> + loff_t start_byte = ((loff_t)page->index << PAGE_SHIFT) + from;
>> + loff_t length = to - from;
>>
>> ret = ocfs2_map_page_blocks(page, phys, inode, from, to, 0);
>> if (ret)
>> @@ -6811,7 +6813,8 @@ void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,
>> if (ret < 0)
>> mlog_errno(ret);
>> else if (ocfs2_should_order_data(inode)) {
>> - ret = ocfs2_jbd2_file_inode(handle, inode);
>> + ret = ocfs2_jbd2_inode_add_write(handle, inode,
>> + start_byte, length);
>> if (ret < 0)
>> mlog_errno(ret);
>> }
>> diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
>> index a4c905d..8de1c9d 100644
>> --- a/fs/ocfs2/aops.c
>> +++ b/fs/ocfs2/aops.c
>> @@ -942,7 +942,8 @@ static void ocfs2_write_failure(struct inode *inode,
>>
>> if (tmppage && page_has_buffers(tmppage)) {
>> if (ocfs2_should_order_data(inode))
>> - ocfs2_jbd2_file_inode(wc->w_handle, inode);
>> + ocfs2_jbd2_inode_add_write(wc->w_handle, inode,
>> + user_pos, user_len);
>>
>> block_commit_write(tmppage, from, to);
>> }
>> @@ -2023,8 +2024,14 @@ int ocfs2_write_end_nolock(struct address_space *mapping,
>> }
>>
>> if (page_has_buffers(tmppage)) {
>> - if (handle && ocfs2_should_order_data(inode))
>> - ocfs2_jbd2_file_inode(handle, inode);
>> + if (handle && ocfs2_should_order_data(inode)) {
>> + loff_t start_byte =
>> + ((loff_t)tmppage->index << PAGE_SHIFT) +
>> + from;
>> + loff_t length = to - from;
>> + ocfs2_jbd2_inode_add_write(handle, inode,
>> + start_byte, length);
>> + }
>> block_commit_write(tmppage, from, to);
>> }
>> }
>> diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
>> index 4435df3..efe9988 100644
>> --- a/fs/ocfs2/file.c
>> +++ b/fs/ocfs2/file.c
>> @@ -706,7 +706,9 @@ static int ocfs2_extend_allocation(struct inode *inode, u32 logical_start,
>> * Thus, we need to explicitly order the zeroed pages.
>> */
>> static handle_t *ocfs2_zero_start_ordered_transaction(struct inode *inode,
>> - struct buffer_head *di_bh)
>> + struct buffer_head *di_bh,
>> + loff_t start_byte,
>> + loff_t length)
>> {
>> struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
>> handle_t *handle = NULL;
>> @@ -722,7 +724,7 @@ static handle_t *ocfs2_zero_start_ordered_transaction(struct inode *inode,
>> goto out;
>> }
>>
>> - ret = ocfs2_jbd2_file_inode(handle, inode);
>> + ret = ocfs2_jbd2_inode_add_write(handle, inode, start_byte, length);
>> if (ret < 0) {
>> mlog_errno(ret);
>> goto out;
>> @@ -761,7 +763,9 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
>> BUG_ON(abs_to > (((u64)index + 1) << PAGE_SHIFT));
>> BUG_ON(abs_from & (inode->i_blkbits - 1));
>>
>> - handle = ocfs2_zero_start_ordered_transaction(inode, di_bh);
>> + handle = ocfs2_zero_start_ordered_transaction(inode, di_bh,
>> + abs_from,
>> + abs_to - abs_from);
>> if (IS_ERR(handle)) {
>> ret = PTR_ERR(handle);
>> goto out;
>> diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h
>> index c0fe6ed..f37473c 100644
>> --- a/fs/ocfs2/journal.h
>> +++ b/fs/ocfs2/journal.h
>> @@ -232,8 +232,8 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode)
>> * ocfs2_journal_access_*() unless you intend to
>> * manage the checksum by hand.
>> * ocfs2_journal_dirty - Mark a journalled buffer as having dirty data.
>> - * ocfs2_jbd2_file_inode - Mark an inode so that its data goes out before
>> - * the current handle commits.
>> + * ocfs2_jbd2_inode_add_write - Mark an inode with range so that its data goes
>> + * out before the current handle commits.
>> */
>>
>> /* You must always start_trans with a number of buffs > 0, but it's
>> @@ -603,9 +603,12 @@ static inline int ocfs2_calc_tree_trunc_credits(struct super_block *sb,
>> return credits;
>> }
>>
>> -static inline int ocfs2_jbd2_file_inode(handle_t *handle, struct inode *inode)
>> +static inline int ocfs2_jbd2_inode_add_write(handle_t *handle, struct inode *inode,
>> + loff_t start_byte, loff_t length)
>> {
>> - return jbd2_journal_inode_add_write(handle, &OCFS2_I(inode)->ip_jinode);
>> + return jbd2_journal_inode_ranged_write(handle,
>> + &OCFS2_I(inode)->ip_jinode,
>> + start_byte, length);
>> }
>>
>> static inline int ocfs2_begin_ordered_truncate(struct inode *inode,
>>
>
> _______________________________________________
> Ocfs2-devel mailing list
> [email protected]
> https://oss.oracle.com/mailman/listinfo/ocfs2-devel
>
On Thu, 18 Jul 2019 08:54:35 +0800 Joseph Qi <[email protected]> wrote:
> Ping...
> If something else should be updated, please let me know.
I'll be processing this (and a ton of other stuff) after the 5.3 merge
window closes.