summaryrefslogtreecommitdiffstats
path: root/fs/ntfs/aops.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-10-19 13:21:19 +0200
committerAnton Altaparmakov <aia21@cantab.net>2005-10-19 13:21:19 +0200
commit7d0ffdb279105d9a87b447758ce4a634496abfd1 (patch)
tree66bd4d6307a81ae65a01acace5fd8ae6f5a30032 /fs/ntfs/aops.c
parentMerge branch 'master' of /usr/src/ntfs-2.6/ (diff)
downloadlinux-7d0ffdb279105d9a87b447758ce4a634496abfd1.tar.xz
linux-7d0ffdb279105d9a87b447758ce4a634496abfd1.zip
NTFS: $EA attributes can be both resident non-resident.
Minor tidying. Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Diffstat (limited to 'fs/ntfs/aops.c')
-rw-r--r--fs/ntfs/aops.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index 8f23c60030c0..1c0a4315876a 100644
--- a/fs/ntfs/aops.c
+++ b/fs/ntfs/aops.c
@@ -1391,8 +1391,7 @@ retry_writepage:
if (NInoEncrypted(ni)) {
unlock_page(page);
BUG_ON(ni->type != AT_DATA);
- ntfs_debug("Denying write access to encrypted "
- "file.");
+ ntfs_debug("Denying write access to encrypted file.");
return -EACCES;
}
/* Compressed data streams are handled in compress.c. */
@@ -1508,8 +1507,8 @@ retry_writepage:
/* Zero out of bounds area in the page cache page. */
memset(kaddr + attr_len, 0, PAGE_CACHE_SIZE - attr_len);
kunmap_atomic(kaddr, KM_USER0);
- flush_dcache_mft_record_page(ctx->ntfs_ino);
flush_dcache_page(page);
+ flush_dcache_mft_record_page(ctx->ntfs_ino);
/* We are done with the page. */
end_page_writeback(page);
/* Finally, mark the mft record dirty, so it gets written back. */