diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-08 23:01:16 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-08 23:01:16 +0100 |
| commit | 7d333d6c739a5cd6d60102ea1a9940cbbb0546ec (patch) | |
| tree | aa8563971adea0f7b2bdb91cda07057e2a85722e /fs/ntfs/aops.c | |
| parent | e604635c8bea16f6177e6133eb3efbfb4a029ef6 (diff) | |
| download | talos-op-linux-7d333d6c739a5cd6d60102ea1a9940cbbb0546ec.tar.gz talos-op-linux-7d333d6c739a5cd6d60102ea1a9940cbbb0546ec.zip | |
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.c | 10 |
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: if (likely(!err)) goto lock_retry_remap; rl = NULL; - lcn = err; } else if (!rl) up_read(&ni->runlist.lock); /* * Failed to map the buffer, even after * retrying. */ + if (!err) + err = -EIO; bh->b_blocknr = -1; ntfs_error(vol->sb, "Failed to write to inode " "0x%lx, attribute type 0x%x, " "vcn 0x%llx, offset 0x%x " "because its location on disk " "could not be determined%s " - "(error code %lli).", + "(error code %i).", ni->mft_no, ni->type, (unsigned long long)vcn, vcn_ofs, is_retry ? " even " - "after retrying" : "", - (long long)lcn); - if (!err) - err = -EIO; + "after retrying" : "", err); goto err_out; } /* We now have a successful remap, i.e. lcn >= 0. */ |
