From: Liu Bo <liubo2009@cn.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Cc: <chris.mason@oracle.com>, <josef@redhat.com>,
Liu Bo <liubo2009@cn.fujitsu.com>
Subject: [PATCH 03/11 v2] Btrfs: modify btrfs_drop_extents API
Date: Thu, 26 May 2011 16:19:18 +0800 [thread overview]
Message-ID: <1306397966-7834-4-git-send-email-liubo2009@cn.fujitsu.com> (raw)
In-Reply-To: <1306397966-7834-1-git-send-email-liubo2009@cn.fujitsu.com>
We want to use btrfs_drop_extent() in log code.
Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
---
fs/btrfs/ctree.h | 3 ++-
fs/btrfs/file.c | 9 +++++++--
fs/btrfs/inode.c | 6 +++---
fs/btrfs/ioctl.c | 4 ++--
fs/btrfs/tree-log.c | 2 +-
5 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index ef68108..1ba3f91 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2575,7 +2575,8 @@ int btrfs_drop_extent_cache(struct inode *inode, u64 start, u64 end,
int btrfs_check_file(struct btrfs_root *root, struct inode *inode);
extern const struct file_operations btrfs_file_operations;
int btrfs_drop_extents(struct btrfs_trans_handle *trans, struct inode *inode,
- u64 start, u64 end, u64 *hint_byte, int drop_cache);
+ u64 start, u64 end, u64 *hint_byte, int drop_cache,
+ int log);
int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,
struct inode *inode, u64 start, u64 end);
int btrfs_release_file(struct inode *inode, struct file *file);
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 75899a0..d19cf3a 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -290,7 +290,8 @@ int btrfs_drop_extent_cache(struct inode *inode, u64 start, u64 end,
* is deleted from the tree.
*/
int btrfs_drop_extents(struct btrfs_trans_handle *trans, struct inode *inode,
- u64 start, u64 end, u64 *hint_byte, int drop_cache)
+ u64 start, u64 end, u64 *hint_byte, int drop_cache,
+ int log)
{
struct btrfs_root *root = BTRFS_I(inode)->root;
struct extent_buffer *leaf;
@@ -309,6 +310,10 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans, struct inode *inode,
int recow;
int ret;
+ /* drop the existed extents in log tree */
+ if (log)
+ root = root->log_root;
+
if (drop_cache)
btrfs_drop_extent_cache(inode, start, end - 1, 0);
@@ -489,7 +494,7 @@ next_slot:
extent_end - key.offset);
extent_end = ALIGN(extent_end,
root->sectorsize);
- } else if (disk_bytenr > 0) {
+ } else if (disk_bytenr > 0 && !log) {
ret = btrfs_free_extent(trans, root,
disk_bytenr, num_bytes, 0,
root->root_key.objectid,
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8957c5d..7242ebb 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -244,7 +244,7 @@ static noinline int cow_file_range_inline(struct btrfs_trans_handle *trans,
}
ret = btrfs_drop_extents(trans, inode, start, aligned_end,
- &hint_byte, 1);
+ &hint_byte, 1, 0);
BUG_ON(ret);
if (isize > actual_end)
@@ -1640,7 +1640,7 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,
* with the others.
*/
ret = btrfs_drop_extents(trans, inode, file_pos, file_pos + num_bytes,
- &hint, 0);
+ &hint, 0, 0);
BUG_ON(ret);
ins.objectid = inode->i_ino;
@@ -3650,7 +3650,7 @@ int btrfs_cont_expand(struct inode *inode, loff_t oldsize, loff_t size)
err = btrfs_drop_extents(trans, inode, cur_offset,
cur_offset + hole_size,
- &hint_byte, 1);
+ &hint_byte, 1, 0);
if (err)
break;
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index cab08fa..5135579 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -2020,7 +2020,7 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
ret = btrfs_drop_extents(trans, inode,
new_key.offset,
new_key.offset + datal,
- &hint_byte, 1);
+ &hint_byte, 1, 0);
BUG_ON(ret);
ret = btrfs_insert_empty_item(trans, root, path,
@@ -2075,7 +2075,7 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
ret = btrfs_drop_extents(trans, inode,
new_key.offset,
new_key.offset + datal,
- &hint_byte, 1);
+ &hint_byte, 1, 0);
BUG_ON(ret);
ret = btrfs_insert_empty_item(trans, root, path,
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 18ac764..fa0e8e4 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -563,7 +563,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
saved_nbytes = inode_get_bytes(inode);
/* drop any overlapping extents */
ret = btrfs_drop_extents(trans, inode, start, extent_end,
- &alloc_hint, 1);
+ &alloc_hint, 1, 0);
BUG_ON(ret);
if (found_type == BTRFS_FILE_EXTENT_REG ||
--
1.6.5.2
next prev parent reply other threads:[~2011-05-26 8:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-26 8:19 [PATCH 00/11 v2] Btrfs: improve write ahead log with sub transaction Liu Bo
2011-05-26 8:19 ` [PATCH 01/11 v2] Btrfs: introduce sub transaction stuff Liu Bo
2011-05-26 8:19 ` [PATCH 02/11 v2] Btrfs: update block generation if should_cow_block fails Liu Bo
2011-05-26 8:19 ` Liu Bo [this message]
2011-05-26 8:19 ` [PATCH 04/11 v2] Btrfs: introduce first sub trans Liu Bo
2011-05-26 8:19 ` [PATCH 05/11 v2] Btrfs: still update inode trans stuff when size remains unchanged Liu Bo
2011-05-26 8:19 ` [PATCH 06/11 v2] Btrfs: improve log with sub transaction Liu Bo
2011-05-26 8:19 ` [PATCH 07/11 v2] Btrfs: add checksum check for log Liu Bo
2011-05-26 8:19 ` [PATCH 08/11 v2] Btrfs: fix a bug of log check Liu Bo
2011-05-26 8:19 ` [PATCH 09/11 v2] Btrfs: kick off useless code Liu Bo
2011-05-26 8:19 ` [PATCH 10/11 v2] Btrfs: deal with EEXIST after iput Liu Bo
2011-05-26 8:19 ` [PATCH 11/11 v2] Btrfs: use the right generation number to read log_root_tree Liu Bo
2011-05-26 8:30 ` [PATCH 00/11 v2] Btrfs: improve write ahead log with sub transaction liubo
2011-06-10 0:40 ` David Sterba
2011-06-10 0:52 ` liubo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1306397966-7834-4-git-send-email-liubo2009@cn.fujitsu.com \
--to=liubo2009@cn.fujitsu.com \
--cc=chris.mason@oracle.com \
--cc=josef@redhat.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).