diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
tree | 5861a45f70c1f283720337abd864498f5afb3dbe /fs/ntfs/file.c | |
parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'fs/ntfs/file.c')
-rw-r--r-- | fs/ntfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index 663c0e341f8b..43179ddd336f 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c | |||
@@ -399,7 +399,7 @@ static inline void ntfs_fault_in_pages_readable_iovec(const struct iovec *iov, | |||
399 | * @cached_page: allocated but as yet unused page | 399 | * @cached_page: allocated but as yet unused page |
400 | * @lru_pvec: lru-buffering pagevec of caller | 400 | * @lru_pvec: lru-buffering pagevec of caller |
401 | * | 401 | * |
402 | * Obtain @nr_pages locked page cache pages from the mapping @maping and | 402 | * Obtain @nr_pages locked page cache pages from the mapping @mapping and |
403 | * starting at index @index. | 403 | * starting at index @index. |
404 | * | 404 | * |
405 | * If a page is newly created, increment its refcount and add it to the | 405 | * If a page is newly created, increment its refcount and add it to the |
@@ -1281,7 +1281,7 @@ rl_not_mapped_enoent: | |||
1281 | 1281 | ||
1282 | /* | 1282 | /* |
1283 | * Copy as much as we can into the pages and return the number of bytes which | 1283 | * 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 | 1284 | * 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. | 1285 | * out to (ofs + bytes) and return the number of bytes which were copied. |
1286 | */ | 1286 | */ |
1287 | static inline size_t ntfs_copy_from_user(struct page **pages, | 1287 | static inline size_t ntfs_copy_from_user(struct page **pages, |