diff options
Diffstat (limited to 'fs/ntfs')
| -rw-r--r-- | fs/ntfs/compress.c | 2 | ||||
| -rw-r--r-- | fs/ntfs/file.c | 4 | ||||
| -rw-r--r-- | fs/ntfs/logfile.c | 2 | ||||
| -rw-r--r-- | fs/ntfs/sysctl.c | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c index 9669541d0119..08f7530e9341 100644 --- a/fs/ntfs/compress.c +++ b/fs/ntfs/compress.c | |||
| @@ -927,7 +927,7 @@ lock_retry_remap: | |||
| 927 | return 0; | 927 | return 0; |
| 928 | 928 | ||
| 929 | ntfs_debug("Failed. Returning error code %s.", err == -EOVERFLOW ? | 929 | ntfs_debug("Failed. Returning error code %s.", err == -EOVERFLOW ? |
| 930 | "EOVERFLOW" : (!err ? "EIO" : "unkown error")); | 930 | "EOVERFLOW" : (!err ? "EIO" : "unknown error")); |
| 931 | return err < 0 ? err : -EIO; | 931 | return err < 0 ? err : -EIO; |
| 932 | 932 | ||
| 933 | read_err: | 933 | read_err: |
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, |
diff --git a/fs/ntfs/logfile.c b/fs/ntfs/logfile.c index 89b02985c054..4dadcdf3d451 100644 --- a/fs/ntfs/logfile.c +++ b/fs/ntfs/logfile.c | |||
| @@ -338,7 +338,7 @@ err_out: | |||
| 338 | * copy of the complete multi sector transfer deprotected page. On failure, | 338 | * copy of the complete multi sector transfer deprotected page. On failure, |
| 339 | * *@wrp is undefined. | 339 | * *@wrp is undefined. |
| 340 | * | 340 | * |
| 341 | * Simillarly, if @lsn is not NULL, on succes *@lsn will be set to the current | 341 | * Simillarly, if @lsn is not NULL, on success *@lsn will be set to the current |
| 342 | * logfile lsn according to this restart page. On failure, *@lsn is undefined. | 342 | * logfile lsn according to this restart page. On failure, *@lsn is undefined. |
| 343 | * | 343 | * |
| 344 | * The following error codes are defined: | 344 | * The following error codes are defined: |
diff --git a/fs/ntfs/sysctl.c b/fs/ntfs/sysctl.c index 9ef85e628fe1..79a89184cb5e 100644 --- a/fs/ntfs/sysctl.c +++ b/fs/ntfs/sysctl.c | |||
| @@ -36,12 +36,11 @@ | |||
| 36 | /* Definition of the ntfs sysctl. */ | 36 | /* Definition of the ntfs sysctl. */ |
| 37 | static ctl_table ntfs_sysctls[] = { | 37 | static ctl_table ntfs_sysctls[] = { |
| 38 | { | 38 | { |
| 39 | .ctl_name = CTL_UNNUMBERED, /* Binary and text IDs. */ | ||
| 40 | .procname = "ntfs-debug", | 39 | .procname = "ntfs-debug", |
| 41 | .data = &debug_msgs, /* Data pointer and size. */ | 40 | .data = &debug_msgs, /* Data pointer and size. */ |
| 42 | .maxlen = sizeof(debug_msgs), | 41 | .maxlen = sizeof(debug_msgs), |
| 43 | .mode = 0644, /* Mode, proc handler. */ | 42 | .mode = 0644, /* Mode, proc handler. */ |
| 44 | .proc_handler = &proc_dointvec | 43 | .proc_handler = proc_dointvec |
| 45 | }, | 44 | }, |
| 46 | {} | 45 | {} |
| 47 | }; | 46 | }; |
| @@ -49,7 +48,6 @@ static ctl_table ntfs_sysctls[] = { | |||
| 49 | /* Define the parent directory /proc/sys/fs. */ | 48 | /* Define the parent directory /proc/sys/fs. */ |
| 50 | static ctl_table sysctls_root[] = { | 49 | static ctl_table sysctls_root[] = { |
| 51 | { | 50 | { |
| 52 | .ctl_name = CTL_FS, | ||
| 53 | .procname = "fs", | 51 | .procname = "fs", |
| 54 | .mode = 0555, | 52 | .mode = 0555, |
| 55 | .child = ntfs_sysctls | 53 | .child = ntfs_sysctls |
