forked from Minki/linux
Btrfs: use helpers for last_trans_log_full_commit instead of opencode
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com> Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com> Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Miao Xie
Chris Mason
parent
1f21ef0a34
commit
995946dd29
@ -26,10 +26,9 @@
|
||||
#include <linux/ratelimit.h>
|
||||
#include <linux/percpu_counter.h>
|
||||
#include "hash.h"
|
||||
#include "ctree.h"
|
||||
#include "tree-log.h"
|
||||
#include "disk-io.h"
|
||||
#include "print-tree.h"
|
||||
#include "transaction.h"
|
||||
#include "volumes.h"
|
||||
#include "raid56.h"
|
||||
#include "locking.h"
|
||||
@ -8714,7 +8713,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans,
|
||||
|
||||
extent_root = root->fs_info->extent_root;
|
||||
|
||||
root->fs_info->last_trans_log_full_commit = trans->transid;
|
||||
btrfs_set_log_full_commit(root->fs_info, trans);
|
||||
|
||||
cache = btrfs_create_block_group_cache(root, chunk_offset, size);
|
||||
if (!cache)
|
||||
|
||||
@ -8329,7 +8329,7 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
||||
BTRFS_I(old_inode)->dir_index = 0ULL;
|
||||
if (unlikely(old_ino == BTRFS_FIRST_FREE_OBJECTID)) {
|
||||
/* force full log commit if subvolume involved. */
|
||||
root->fs_info->last_trans_log_full_commit = trans->transid;
|
||||
btrfs_set_log_full_commit(root->fs_info, trans);
|
||||
} else {
|
||||
ret = btrfs_insert_inode_ref(trans, dest,
|
||||
new_dentry->d_name.name,
|
||||
|
||||
@ -20,13 +20,11 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/blkdev.h>
|
||||
#include <linux/list_sort.h>
|
||||
#include "ctree.h"
|
||||
#include "transaction.h"
|
||||
#include "tree-log.h"
|
||||
#include "disk-io.h"
|
||||
#include "locking.h"
|
||||
#include "print-tree.h"
|
||||
#include "backref.h"
|
||||
#include "tree-log.h"
|
||||
#include "hash.h"
|
||||
|
||||
/* magic values for the inode_only field in btrfs_log_inode:
|
||||
@ -144,12 +142,10 @@ static int start_log_trans(struct btrfs_trans_handle *trans,
|
||||
|
||||
mutex_lock(&root->log_mutex);
|
||||
if (root->log_root) {
|
||||
if (ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) ==
|
||||
trans->transid) {
|
||||
if (btrfs_need_log_full_commit(root->fs_info, trans)) {
|
||||
ret = -EAGAIN;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!root->log_start_pid) {
|
||||
root->log_start_pid = current->pid;
|
||||
clear_bit(BTRFS_ROOT_MULTI_LOG_TASKS, &root->state);
|
||||
@ -2512,8 +2508,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
|
||||
}
|
||||
|
||||
/* bail out if we need to do a full commit */
|
||||
if (ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) ==
|
||||
trans->transid) {
|
||||
if (btrfs_need_log_full_commit(root->fs_info, trans)) {
|
||||
ret = -EAGAIN;
|
||||
btrfs_free_logged_extents(log, log_transid);
|
||||
mutex_unlock(&root->log_mutex);
|
||||
@ -2534,8 +2529,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
|
||||
blk_finish_plug(&plug);
|
||||
btrfs_abort_transaction(trans, root, ret);
|
||||
btrfs_free_logged_extents(log, log_transid);
|
||||
ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
|
||||
trans->transid;
|
||||
btrfs_set_log_full_commit(root->fs_info, trans);
|
||||
mutex_unlock(&root->log_mutex);
|
||||
goto out;
|
||||
}
|
||||
@ -2578,8 +2572,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
|
||||
list_del_init(&root_log_ctx.list);
|
||||
|
||||
blk_finish_plug(&plug);
|
||||
ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
|
||||
trans->transid;
|
||||
btrfs_set_log_full_commit(root->fs_info, trans);
|
||||
|
||||
if (ret != -ENOSPC) {
|
||||
btrfs_abort_transaction(trans, root, ret);
|
||||
mutex_unlock(&log_root_tree->log_mutex);
|
||||
@ -2623,8 +2617,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
|
||||
* now that we've moved on to the tree of log tree roots,
|
||||
* check the full commit flag again
|
||||
*/
|
||||
if (ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) ==
|
||||
trans->transid) {
|
||||
if (btrfs_need_log_full_commit(root->fs_info, trans)) {
|
||||
blk_finish_plug(&plug);
|
||||
btrfs_wait_marked_extents(log, &log->dirty_log_pages, mark);
|
||||
btrfs_free_logged_extents(log, log_transid);
|
||||
@ -2638,8 +2631,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
|
||||
EXTENT_DIRTY | EXTENT_NEW);
|
||||
blk_finish_plug(&plug);
|
||||
if (ret) {
|
||||
ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
|
||||
trans->transid;
|
||||
btrfs_set_log_full_commit(root->fs_info, trans);
|
||||
btrfs_abort_transaction(trans, root, ret);
|
||||
btrfs_free_logged_extents(log, log_transid);
|
||||
mutex_unlock(&log_root_tree->log_mutex);
|
||||
@ -2668,8 +2660,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
|
||||
*/
|
||||
ret = write_ctree_super(trans, root->fs_info->tree_root, 1);
|
||||
if (ret) {
|
||||
ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
|
||||
trans->transid;
|
||||
btrfs_set_log_full_commit(root->fs_info, trans);
|
||||
btrfs_abort_transaction(trans, root, ret);
|
||||
goto out_wake_log_root;
|
||||
}
|
||||
@ -2887,7 +2878,7 @@ fail:
|
||||
out_unlock:
|
||||
mutex_unlock(&BTRFS_I(dir)->log_mutex);
|
||||
if (ret == -ENOSPC) {
|
||||
root->fs_info->last_trans_log_full_commit = trans->transid;
|
||||
btrfs_set_log_full_commit(root->fs_info, trans);
|
||||
ret = 0;
|
||||
} else if (ret < 0)
|
||||
btrfs_abort_transaction(trans, root, ret);
|
||||
@ -2920,7 +2911,7 @@ int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
|
||||
dirid, &index);
|
||||
mutex_unlock(&BTRFS_I(inode)->log_mutex);
|
||||
if (ret == -ENOSPC) {
|
||||
root->fs_info->last_trans_log_full_commit = trans->transid;
|
||||
btrfs_set_log_full_commit(root->fs_info, trans);
|
||||
ret = 0;
|
||||
} else if (ret < 0 && ret != -ENOENT)
|
||||
btrfs_abort_transaction(trans, root, ret);
|
||||
@ -4131,8 +4122,7 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
|
||||
* make sure any commits to the log are forced
|
||||
* to be full commits
|
||||
*/
|
||||
root->fs_info->last_trans_log_full_commit =
|
||||
trans->transid;
|
||||
btrfs_set_log_full_commit(root->fs_info, trans);
|
||||
ret = 1;
|
||||
break;
|
||||
}
|
||||
@ -4178,6 +4168,10 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
|
||||
goto end_no_trans;
|
||||
}
|
||||
|
||||
/*
|
||||
* The prev transaction commit doesn't complete, we need do
|
||||
* full commit by ourselves.
|
||||
*/
|
||||
if (root->fs_info->last_trans_log_full_commit >
|
||||
root->fs_info->last_trans_committed) {
|
||||
ret = 1;
|
||||
@ -4247,7 +4241,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
|
||||
end_trans:
|
||||
dput(old_parent);
|
||||
if (ret < 0) {
|
||||
root->fs_info->last_trans_log_full_commit = trans->transid;
|
||||
btrfs_set_log_full_commit(root->fs_info, trans);
|
||||
ret = 1;
|
||||
}
|
||||
|
||||
|
||||
@ -19,6 +19,9 @@
|
||||
#ifndef __TREE_LOG_
|
||||
#define __TREE_LOG_
|
||||
|
||||
#include "ctree.h"
|
||||
#include "transaction.h"
|
||||
|
||||
/* return value for btrfs_log_dentry_safe that means we don't need to log it at all */
|
||||
#define BTRFS_NO_LOG_SYNC 256
|
||||
|
||||
@ -35,6 +38,19 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
|
||||
INIT_LIST_HEAD(&ctx->list);
|
||||
}
|
||||
|
||||
static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
|
||||
struct btrfs_trans_handle *trans)
|
||||
{
|
||||
ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
|
||||
}
|
||||
|
||||
static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
|
||||
struct btrfs_trans_handle *trans)
|
||||
{
|
||||
return ACCESS_ONCE(fs_info->last_trans_log_full_commit) ==
|
||||
trans->transid;
|
||||
}
|
||||
|
||||
int btrfs_sync_log(struct btrfs_trans_handle *trans,
|
||||
struct btrfs_root *root, struct btrfs_log_ctx *ctx);
|
||||
int btrfs_free_log(struct btrfs_trans_handle *trans, struct btrfs_root *root);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user