* [PATCH] reiserfs: Truncate blocks not used by a write
@ 2009-09-01 15:55 Jan Kara
2009-09-01 17:42 ` Christoph Hellwig
0 siblings, 1 reply; 3+ messages in thread
From: Jan Kara @ 2009-09-01 15:55 UTC (permalink / raw)
To: Andrew Morton; +Cc: reiserfs-devel, jeffm, LKML
It can happen that write does not use all the blocks allocated in write_begin
either because of some filesystem error (like ENOSPC) or because page with
data to write has been removed from memory. We truncate these blocks so that
we don't have dangling blocks beyond i_size.
Signed-off-by: Jan Kara <jack@suse.cz>
---
Andrew, would you merge the patch please? Thanks.
diff -rupX /home/jack/.kerndiffexclude linux-2.6.27-SLE11_BRANCH/fs/reiserfs/inode.c linux-2.6.27-SLE11_BRANCH-1-reiserfs_corruption//fs/reiserfs/inode.c
--- linux-2.6.27-SLE11_BRANCH/fs/reiserfs/inode.c 2009-06-02 17:14:29.000000000 +0200
+++ linux-2.6.27-SLE11_BRANCH-1-reiserfs_corruption//fs/reiserfs/inode.c 2009-06-24 14:39:44.000000000 +0200
@@ -2606,6 +2610,8 @@ static int reiserfs_write_begin(struct f
if (ret) {
unlock_page(page);
page_cache_release(page);
+ /* Truncate allocated blocks */
+ vmtruncate(inode, inode->i_size);
}
return ret;
}
@@ -2698,8 +2705,7 @@ static int reiserfs_write_end(struct fil
** transaction tracking stuff when the size changes. So, we have
** to do the i_size updates here.
*/
- pos += copied;
- if (pos > inode->i_size) {
+ if (pos + copied > inode->i_size) {
struct reiserfs_transaction_handle myth;
reiserfs_write_lock(inode->i_sb);
/* If the file have grown beyond the border where it
@@ -2717,7 +2723,7 @@ static int reiserfs_write_end(struct fil
goto journal_error;
}
reiserfs_update_inode_transaction(inode);
- inode->i_size = pos;
+ inode->i_size = pos + copied;
/*
* this will just nest into our transaction. It's important
* to use mark_inode_dirty so the inode gets pushed around on the
@@ -2744,6 +2750,10 @@ static int reiserfs_write_end(struct fil
out:
unlock_page(page);
page_cache_release(page);
+
+ if (pos + len > inode->i_size)
+ vmtruncate(inode, inode->i_size);
+
return ret == 0 ? copied : ret;
journal_error:
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] reiserfs: Truncate blocks not used by a write
2009-09-01 15:55 [PATCH] reiserfs: Truncate blocks not used by a write Jan Kara
@ 2009-09-01 17:42 ` Christoph Hellwig
2009-09-01 18:10 ` Jan Kara
0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2009-09-01 17:42 UTC (permalink / raw)
To: Jan Kara; +Cc: Andrew Morton, reiserfs-devel, jeffm, LKML
On Tue, Sep 01, 2009 at 05:55:54PM +0200, Jan Kara wrote:
> It can happen that write does not use all the blocks allocated in write_begin
> either because of some filesystem error (like ENOSPC) or because page with
> data to write has been removed from memory. We truncate these blocks so that
> we don't have dangling blocks beyond i_size.
vmtruncate is in the process of going away for 2.6.32. Please use a
filesystems-specific routine to just trim the blocks, similar to what
the vmtruncate call in the generic write_begin helper is beeing replaced
with in Nick's truncate patch series.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] reiserfs: Truncate blocks not used by a write
2009-09-01 17:42 ` Christoph Hellwig
@ 2009-09-01 18:10 ` Jan Kara
0 siblings, 0 replies; 3+ messages in thread
From: Jan Kara @ 2009-09-01 18:10 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: Jan Kara, Andrew Morton, reiserfs-devel, jeffm, LKML
On Tue 01-09-09 13:42:56, Christoph Hellwig wrote:
> On Tue, Sep 01, 2009 at 05:55:54PM +0200, Jan Kara wrote:
> > It can happen that write does not use all the blocks allocated in write_begin
> > either because of some filesystem error (like ENOSPC) or because page with
> > data to write has been removed from memory. We truncate these blocks so that
> > we don't have dangling blocks beyond i_size.
>
> vmtruncate is in the process of going away for 2.6.32. Please use a
> filesystems-specific routine to just trim the blocks, similar to what
> the vmtruncate call in the generic write_begin helper is beeing replaced
> with in Nick's truncate patch series.
Reiserfs does not have such helper (yet), that's why I've used
vmtruncate. But OK, I'll try to convert reiserfs to the new truncate
sequence and then make this fix use it...
Honza
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-09-01 18:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-01 15:55 [PATCH] reiserfs: Truncate blocks not used by a write Jan Kara
2009-09-01 17:42 ` Christoph Hellwig
2009-09-01 18:10 ` Jan Kara
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).