Commit 149f0c52 authored by Anton Altaparmakov's avatar Anton Altaparmakov

NTFS: Repeat a failed ntfs_truncate() in fs/ntfs/aops.c::ntfs_writepage()

      and abort if it fails again.
Signed-off-by: default avatarAnton Altaparmakov <aia21@cantab.net>
parent 07a4e2da
...@@ -1237,19 +1237,30 @@ done: ...@@ -1237,19 +1237,30 @@ done:
static int ntfs_writepage(struct page *page, struct writeback_control *wbc) static int ntfs_writepage(struct page *page, struct writeback_control *wbc)
{ {
loff_t i_size; loff_t i_size;
struct inode *vi; struct inode *vi = page->mapping->host;
ntfs_inode *ni, *base_ni; ntfs_inode *base_ni = NULL, *ni = NTFS_I(vi);
char *kaddr; char *kaddr;
ntfs_attr_search_ctx *ctx; ntfs_attr_search_ctx *ctx = NULL;
MFT_RECORD *m; MFT_RECORD *m = NULL;
u32 attr_len; u32 attr_len;
int err; int err;
BUG_ON(!PageLocked(page)); BUG_ON(!PageLocked(page));
/*
vi = page->mapping->host; * If a previous ntfs_truncate() failed, repeat it and abort if it
* fails again.
*/
if (unlikely(NInoTruncateFailed(ni))) {
down_write(&vi->i_alloc_sem);
err = ntfs_truncate(vi);
up_write(&vi->i_alloc_sem);
if (err || NInoTruncateFailed(ni)) {
if (!err)
err = -EIO;
goto err_out;
}
}
i_size = i_size_read(vi); i_size = i_size_read(vi);
/* Is the page fully outside i_size? (truncate in progress) */ /* Is the page fully outside i_size? (truncate in progress) */
if (unlikely(page->index >= (i_size + PAGE_CACHE_SIZE - 1) >> if (unlikely(page->index >= (i_size + PAGE_CACHE_SIZE - 1) >>
PAGE_CACHE_SHIFT)) { PAGE_CACHE_SHIFT)) {
...@@ -1262,8 +1273,6 @@ static int ntfs_writepage(struct page *page, struct writeback_control *wbc) ...@@ -1262,8 +1273,6 @@ static int ntfs_writepage(struct page *page, struct writeback_control *wbc)
ntfs_debug("Write outside i_size - truncated?"); ntfs_debug("Write outside i_size - truncated?");
return 0; return 0;
} }
ni = NTFS_I(vi);
/* NInoNonResident() == NInoIndexAllocPresent() */ /* NInoNonResident() == NInoIndexAllocPresent() */
if (NInoNonResident(ni)) { if (NInoNonResident(ni)) {
/* /*
...@@ -1419,8 +1428,10 @@ err_out: ...@@ -1419,8 +1428,10 @@ err_out:
err = 0; err = 0;
} else { } else {
ntfs_error(vi->i_sb, "Resident attribute write failed with " ntfs_error(vi->i_sb, "Resident attribute write failed with "
"error %i. Setting page error flag.", err); "error %i.", err);
SetPageError(page); SetPageError(page);
NVolSetErrors(ni->vol);
make_bad_inode(vi);
} }
unlock_page(page); unlock_page(page);
if (ctx) if (ctx)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment