From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [PATCH 03/09] f2fs: should truncate any allocated block for inline_data write
Date: Sun, 19 Oct 2014 22:18:26 -0700 [thread overview]
Message-ID: <1413782312-11631-3-git-send-email-jaegeuk@kernel.org> (raw)
In-Reply-To: <1413782312-11631-1-git-send-email-jaegeuk@kernel.org>
When trying to write inline_data, we should truncate any data block allocated
and pointed by the inode block.
We should consider the data index is not 0.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/inline.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 88036fd..e3abcfb 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -166,6 +166,14 @@ int f2fs_write_inline_data(struct inode *inode,
return err;
ipage = dn.inode_page;
+ /* Release any data block if it is allocated */
+ if (!f2fs_has_inline_data(inode)) {
+ int count = ADDRS_PER_PAGE(dn.node_page, F2FS_I(inode));
+ truncate_data_blocks_range(&dn, count);
+ set_inode_flag(F2FS_I(inode), FI_INLINE_DATA);
+ stat_inc_inline_inode(inode);
+ }
+
f2fs_wait_on_page_writeback(ipage, NODE);
zero_user_segment(ipage, INLINE_DATA_OFFSET,
INLINE_DATA_OFFSET + MAX_INLINE_DATA);
@@ -174,13 +182,6 @@ int f2fs_write_inline_data(struct inode *inode,
memcpy(dst_addr, src_addr, size);
kunmap(page);
- /* Release the first data block if it is allocated */
- if (!f2fs_has_inline_data(inode)) {
- truncate_data_blocks_range(&dn, 1);
- set_inode_flag(F2FS_I(inode), FI_INLINE_DATA);
- stat_inc_inline_inode(inode);
- }
-
set_inode_flag(F2FS_I(inode), FI_APPEND_WRITE);
sync_inode_page(&dn);
f2fs_put_dnode(&dn);
--
2.1.1
------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://p.sf.net/sfu/Zoho
next prev parent reply other threads:[~2014-10-20 5:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-20 5:18 [PATCH 01/09] f2fs: do not make dirty any inmemory pages Jaegeuk Kim
2014-10-20 5:18 ` [PATCH 02/09] f2fs: invalidate inmemory page Jaegeuk Kim
2014-10-20 5:18 ` Jaegeuk Kim [this message]
2014-10-20 5:18 ` [PATCH 04/09] f2fs: fix race conditon on truncation with inline_data Jaegeuk Kim
2014-10-20 5:18 ` [PATCH 05/09] f2fs: use highmem for directory pages Jaegeuk Kim
2014-10-20 5:18 ` [PATCH 06/09] f2fs: avoid to allocate when inline_data was written Jaegeuk Kim
2014-10-20 5:18 ` [PATCH 07/09] f2fs: fix to call f2fs_unlock_op Jaegeuk Kim
2014-10-20 5:18 ` [PATCH 08/09] f2fs: avoid build warning Jaegeuk Kim
2014-10-20 5:18 ` [PATCH 09/09] f2fs: avoid infinite loop at cp_error Jaegeuk Kim
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=1413782312-11631-3-git-send-email-jaegeuk@kernel.org \
--to=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@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).