diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2004-11-11 06:18:10 -0500 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-04 09:24:16 -0400 |
commit | da28438cae9a271c5c232177f81dfb243de9b7fa (patch) | |
tree | 40817e52c229dbb288f6425b2056c1ad61ad6470 /fs/ntfs/attrib.c | |
parent | 8800cea62025a5209d110c5fa5990429239d6eee (diff) |
NTFS: Use i_size_read() in fs/ntfs/attrib.c::ntfs_attr_set().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Diffstat (limited to 'fs/ntfs/attrib.c')
-rw-r--r-- | fs/ntfs/attrib.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c index 1ff7f90a18b0..7d668466dcd7 100644 --- a/fs/ntfs/attrib.c +++ b/fs/ntfs/attrib.c | |||
@@ -1127,6 +1127,10 @@ int ntfs_attr_record_resize(MFT_RECORD *m, ATTR_RECORD *a, u32 new_size) | |||
1127 | * byte offset @ofs inside the attribute with the constant byte @val. | 1127 | * byte offset @ofs inside the attribute with the constant byte @val. |
1128 | * | 1128 | * |
1129 | * This function is effectively like memset() applied to an ntfs attribute. | 1129 | * This function is effectively like memset() applied to an ntfs attribute. |
1130 | * Note thie function actually only operates on the page cache pages belonging | ||
1131 | * to the ntfs attribute and it marks them dirty after doing the memset(). | ||
1132 | * Thus it relies on the vm dirty page write code paths to cause the modified | ||
1133 | * pages to be written to the mft record/disk. | ||
1130 | * | 1134 | * |
1131 | * Return 0 on success and -errno on error. An error code of -ESPIPE means | 1135 | * Return 0 on success and -errno on error. An error code of -ESPIPE means |
1132 | * that @ofs + @cnt were outside the end of the attribute and no write was | 1136 | * that @ofs + @cnt were outside the end of the attribute and no write was |
@@ -1155,7 +1159,7 @@ int ntfs_attr_set(ntfs_inode *ni, const s64 ofs, const s64 cnt, const u8 val) | |||
1155 | end = ofs + cnt; | 1159 | end = ofs + cnt; |
1156 | end_ofs = end & ~PAGE_CACHE_MASK; | 1160 | end_ofs = end & ~PAGE_CACHE_MASK; |
1157 | /* If the end is outside the inode size return -ESPIPE. */ | 1161 | /* If the end is outside the inode size return -ESPIPE. */ |
1158 | if (unlikely(end > VFS_I(ni)->i_size)) { | 1162 | if (unlikely(end > i_size_read(VFS_I(ni)))) { |
1159 | ntfs_error(vol->sb, "Request exceeds end of attribute."); | 1163 | ntfs_error(vol->sb, "Request exceeds end of attribute."); |
1160 | return -ESPIPE; | 1164 | return -ESPIPE; |
1161 | } | 1165 | } |