aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ntfs/aops.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-09-08 18:01:16 -0400
committerAnton Altaparmakov <aia21@cantab.net>2005-09-08 18:01:16 -0400
commit7d333d6c739a5cd6d60102ea1a9940cbbb0546ec (patch)
treeaa8563971adea0f7b2bdb91cda07057e2a85722e /fs/ntfs/aops.c
parente604635c8bea16f6177e6133eb3efbfb4a029ef6 (diff)
NTFS: 2.1.24 release and some minor final fixes.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Diffstat (limited to 'fs/ntfs/aops.c')
-rw-r--r--fs/ntfs/aops.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index 950b686f02d3..545236414d59 100644
--- a/fs/ntfs/aops.c
+++ b/fs/ntfs/aops.c
@@ -1727,27 +1727,25 @@ lock_retry_remap:
1727 if (likely(!err)) 1727 if (likely(!err))
1728 goto lock_retry_remap; 1728 goto lock_retry_remap;
1729 rl = NULL; 1729 rl = NULL;
1730 lcn = err;
1731 } else if (!rl) 1730 } else if (!rl)
1732 up_read(&ni->runlist.lock); 1731 up_read(&ni->runlist.lock);
1733 /* 1732 /*
1734 * Failed to map the buffer, even after 1733 * Failed to map the buffer, even after
1735 * retrying. 1734 * retrying.
1736 */ 1735 */
1736 if (!err)
1737 err = -EIO;
1737 bh->b_blocknr = -1; 1738 bh->b_blocknr = -1;
1738 ntfs_error(vol->sb, "Failed to write to inode " 1739 ntfs_error(vol->sb, "Failed to write to inode "
1739 "0x%lx, attribute type 0x%x, " 1740 "0x%lx, attribute type 0x%x, "
1740 "vcn 0x%llx, offset 0x%x " 1741 "vcn 0x%llx, offset 0x%x "
1741 "because its location on disk " 1742 "because its location on disk "
1742 "could not be determined%s " 1743 "could not be determined%s "
1743 "(error code %lli).", 1744 "(error code %i).",
1744 ni->mft_no, ni->type, 1745 ni->mft_no, ni->type,
1745 (unsigned long long)vcn, 1746 (unsigned long long)vcn,
1746 vcn_ofs, is_retry ? " even " 1747 vcn_ofs, is_retry ? " even "
1747 "after retrying" : "", 1748 "after retrying" : "", err);
1748 (long long)lcn);
1749 if (!err)
1750 err = -EIO;
1751 goto err_out; 1749 goto err_out;
1752 } 1750 }
1753 /* We now have a successful remap, i.e. lcn >= 0. */ 1751 /* We now have a successful remap, i.e. lcn >= 0. */