aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ntfs/file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ntfs/file.c')
-rw-r--r--fs/ntfs/file.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 663c0e341f8b..8804f093ba75 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -20,6 +20,7 @@
20 */ 20 */
21 21
22#include <linux/buffer_head.h> 22#include <linux/buffer_head.h>
23#include <linux/gfp.h>
23#include <linux/pagemap.h> 24#include <linux/pagemap.h>
24#include <linux/pagevec.h> 25#include <linux/pagevec.h>
25#include <linux/sched.h> 26#include <linux/sched.h>
@@ -399,7 +400,7 @@ static inline void ntfs_fault_in_pages_readable_iovec(const struct iovec *iov,
399 * @cached_page: allocated but as yet unused page 400 * @cached_page: allocated but as yet unused page
400 * @lru_pvec: lru-buffering pagevec of caller 401 * @lru_pvec: lru-buffering pagevec of caller
401 * 402 *
402 * Obtain @nr_pages locked page cache pages from the mapping @maping and 403 * Obtain @nr_pages locked page cache pages from the mapping @mapping and
403 * starting at index @index. 404 * starting at index @index.
404 * 405 *
405 * If a page is newly created, increment its refcount and add it to the 406 * If a page is newly created, increment its refcount and add it to the
@@ -1281,7 +1282,7 @@ rl_not_mapped_enoent:
1281 1282
1282/* 1283/*
1283 * Copy as much as we can into the pages and return the number of bytes which 1284 * Copy as much as we can into the pages and return the number of bytes which
1284 * were sucessfully copied. If a fault is encountered then clear the pages 1285 * were successfully copied. If a fault is encountered then clear the pages
1285 * out to (ofs + bytes) and return the number of bytes which were copied. 1286 * out to (ofs + bytes) and return the number of bytes which were copied.
1286 */ 1287 */
1287static inline size_t ntfs_copy_from_user(struct page **pages, 1288static inline size_t ntfs_copy_from_user(struct page **pages,
@@ -2182,7 +2183,7 @@ static int ntfs_file_fsync(struct file *filp, struct dentry *dentry,
2182 ntfs_debug("Entering for inode 0x%lx.", vi->i_ino); 2183 ntfs_debug("Entering for inode 0x%lx.", vi->i_ino);
2183 BUG_ON(S_ISDIR(vi->i_mode)); 2184 BUG_ON(S_ISDIR(vi->i_mode));
2184 if (!datasync || !NInoNonResident(NTFS_I(vi))) 2185 if (!datasync || !NInoNonResident(NTFS_I(vi)))
2185 ret = ntfs_write_inode(vi, 1); 2186 ret = __ntfs_write_inode(vi, 1);
2186 write_inode_now(vi, !datasync); 2187 write_inode_now(vi, !datasync);
2187 /* 2188 /*
2188 * NOTE: If we were to use mapping->private_list (see ext2 and 2189 * NOTE: If we were to use mapping->private_list (see ext2 and