| Message ID | 1308646193-7086-11-git-send-email-liubo2009@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/21/2011 04:49 AM, Liu Bo wrote: > There are two cases when BTRFS_I(inode)->logged_trans is zero: > a) an inode is just allocated; > b) iput an inode and reread it. > > However, in b) if btrfs is not committed yet, and this inode _may_ still remain > in log tree. > > So we need to check the log tree to get logged_trans a right value > in case it hits a EEXIST while logging. Instead of doing this why not just check and see if the inode has been logged but the transaction has not yet been committed in btrfs_drop_inode? That way the inode doesn't get evicted from cache until after we know it's ok and that way we don't have to waste a tree lookup. Thanks, Josef -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/21/2011 10:00 PM, Josef Bacik wrote: > On 06/21/2011 04:49 AM, Liu Bo wrote: >> There are two cases when BTRFS_I(inode)->logged_trans is zero: >> a) an inode is just allocated; >> b) iput an inode and reread it. >> >> However, in b) if btrfs is not committed yet, and this inode _may_ >> still remain >> in log tree. >> >> So we need to check the log tree to get logged_trans a right value >> in case it hits a EEXIST while logging. > > Instead of doing this why not just check and see if the inode has been > logged but the transaction has not yet been committed in > btrfs_drop_inode? That way the inode doesn't get evicted from cache > until after we know it's ok and that way we don't have to waste a tree > lookup. Thanks, > Good idea, I'll follow it. thanks, liubo > Josef > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 0007ae3..6eff806 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1786,12 +1786,9 @@ static int btrfs_finish_ordered_io(struct inode *inode, u64 start, u64 end) add_pending_csums(trans, inode, ordered_extent->file_offset, &ordered_extent->list); - ret = btrfs_ordered_update_i_size(inode, 0, ordered_extent); - if (!ret) { - ret = btrfs_update_inode(trans, root, inode); - BUG_ON(ret); - } else - btrfs_set_inode_last_trans(trans, inode); + btrfs_ordered_update_i_size(inode, 0, ordered_extent); + ret = btrfs_update_inode(trans, root, inode); + BUG_ON(ret); ret = 0; out: if (nolock) { diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index f1e95bf..3cf7ed2 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -3063,6 +3063,37 @@ out: return ret; } +static int check_logged_trans(struct btrfs_trans_handle *trans, + struct btrfs_root *root, struct inode *inode) +{ + struct btrfs_inode_item *inode_item; + struct btrfs_path *path; + int ret; + + path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; + + ret = btrfs_search_slot(trans, root, + &BTRFS_I(inode)->location, path, 0, 0); + if (ret) { + if (ret > 0) + ret = 0; + goto out; + } + + btrfs_unlock_up_safe(path, 1); + inode_item = btrfs_item_ptr(path->nodes[0], path->slots[0], + struct btrfs_inode_item); + + BTRFS_I(inode)->logged_trans = btrfs_inode_transid(path->nodes[0], + inode_item); +out: + btrfs_free_path(path); + return ret; +} + + static int inode_in_log(struct btrfs_trans_handle *trans, struct inode *inode) { @@ -3115,6 +3146,18 @@ int btrfs_log_inode_parent(struct btrfs_trans_handle *trans, if (ret) goto end_no_trans; + /* + * After we iput a inode and reread it from disk, logged_trans is 0. + * However, this inode _may_ still remain in log tree and not be + * committed yet. + * So we need to check the log tree to get logged_trans a right value. + */ + if (!BTRFS_I(inode)->logged_trans && root->log_root) { + ret = check_logged_trans(trans, root->log_root, inode); + if (ret) + goto end_no_trans; + } + if (inode_in_log(trans, inode)) { ret = BTRFS_NO_LOG_SYNC; goto end_no_trans;
There are two cases when BTRFS_I(inode)->logged_trans is zero: a) an inode is just allocated; b) iput an inode and reread it. However, in b) if btrfs is not committed yet, and this inode _may_ still remain in log tree. So we need to check the log tree to get logged_trans a right value in case it hits a EEXIST while logging. Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com> --- fs/btrfs/inode.c | 9 +++------ fs/btrfs/tree-log.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 6 deletions(-)