diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /fs | |
parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
"Usual stuff -- comment/printk typo fixes, documentation updates, dead
code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
HOWTO: fix double words typo
x86 mtrr: fix comment typo in mtrr_bp_init
propagate name change to comments in kernel source
doc: Update the name of profiling based on sysfs
treewide: Fix typos in various drivers
treewide: Fix typos in various Kconfig
wireless: mwifiex: Fix typo in wireless/mwifiex driver
messages: i2o: Fix typo in messages/i2o
scripts/kernel-doc: check that non-void fcts describe their return value
Kernel-doc: Convention: Use a "Return" section to describe return values
radeon: Fix typo and copy/paste error in comments
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
various: Fix spelling of "asynchronous" in comments.
Fix misspellings of "whether" in comments.
eisa: Fix spelling of "asynchronous".
various: Fix spelling of "registered" in comments.
doc: fix quite a few typos within Documentation
target: iscsi: fix comment typos in target/iscsi drivers
treewide: fix typo of "suport" in various comments and Kconfig
treewide: fix typo of "suppport" in various comments
...
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/ctree.h | 2 | ||||
-rw-r--r-- | fs/btrfs/extent-tree.c | 2 | ||||
-rw-r--r-- | fs/btrfs/extent_map.c | 3 | ||||
-rw-r--r-- | fs/btrfs/ordered-data.h | 2 | ||||
-rw-r--r-- | fs/btrfs/volumes.c | 2 | ||||
-rw-r--r-- | fs/cifs/README | 2 | ||||
-rw-r--r-- | fs/ext4/ext4.h | 2 | ||||
-rw-r--r-- | fs/fhandle.c | 4 | ||||
-rw-r--r-- | fs/hugetlbfs/inode.c | 2 | ||||
-rw-r--r-- | fs/jbd/transaction.c | 2 | ||||
-rw-r--r-- | fs/jbd2/transaction.c | 2 | ||||
-rw-r--r-- | fs/logfs/inode.c | 2 | ||||
-rw-r--r-- | fs/ncpfs/mmap.c | 2 | ||||
-rw-r--r-- | fs/notify/fanotify/Kconfig | 2 | ||||
-rw-r--r-- | fs/notify/notification.c | 2 |
15 files changed, 16 insertions, 17 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index c72ead869507..596617ecd329 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -413,7 +413,7 @@ struct btrfs_root_backup { | |||
413 | __le64 bytes_used; | 413 | __le64 bytes_used; |
414 | __le64 num_devices; | 414 | __le64 num_devices; |
415 | /* future */ | 415 | /* future */ |
416 | __le64 unsed_64[4]; | 416 | __le64 unused_64[4]; |
417 | 417 | ||
418 | u8 tree_root_level; | 418 | u8 tree_root_level; |
419 | u8 chunk_root_level; | 419 | u8 chunk_root_level; |
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 3d3e2c17d8d1..06b2635073f3 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -3888,7 +3888,7 @@ static int flush_space(struct btrfs_root *root, | |||
3888 | * @root - the root we're allocating for | 3888 | * @root - the root we're allocating for |
3889 | * @block_rsv - the block_rsv we're allocating for | 3889 | * @block_rsv - the block_rsv we're allocating for |
3890 | * @orig_bytes - the number of bytes we want | 3890 | * @orig_bytes - the number of bytes we want |
3891 | * @flush - wether or not we can flush to make our reservation | 3891 | * @flush - whether or not we can flush to make our reservation |
3892 | * | 3892 | * |
3893 | * This will reserve orgi_bytes number of bytes from the space info associated | 3893 | * This will reserve orgi_bytes number of bytes from the space info associated |
3894 | * with the block_rsv. If there is not enough space it will make an attempt to | 3894 | * with the block_rsv. If there is not enough space it will make an attempt to |
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index b8cbc8d5c7f7..ce9f79216723 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c | |||
@@ -234,12 +234,11 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em) | |||
234 | } | 234 | } |
235 | 235 | ||
236 | /** | 236 | /** |
237 | * unpint_extent_cache - unpin an extent from the cache | 237 | * unpin_extent_cache - unpin an extent from the cache |
238 | * @tree: tree to unpin the extent in | 238 | * @tree: tree to unpin the extent in |
239 | * @start: logical offset in the file | 239 | * @start: logical offset in the file |
240 | * @len: length of the extent | 240 | * @len: length of the extent |
241 | * @gen: generation that this extent has been modified in | 241 | * @gen: generation that this extent has been modified in |
242 | * @prealloc: if this is set we need to clear the prealloc flag | ||
243 | * | 242 | * |
244 | * Called after an extent has been written to disk properly. Set the generation | 243 | * Called after an extent has been written to disk properly. Set the generation |
245 | * to the generation that actually added the file item to the inode so we know | 244 | * to the generation that actually added the file item to the inode so we know |
diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h index dd27a0b46a37..853fc7beedfa 100644 --- a/fs/btrfs/ordered-data.h +++ b/fs/btrfs/ordered-data.h | |||
@@ -76,7 +76,7 @@ struct btrfs_ordered_sum { | |||
76 | 76 | ||
77 | #define BTRFS_ORDERED_IOERR 6 /* We had an io error when writing this out */ | 77 | #define BTRFS_ORDERED_IOERR 6 /* We had an io error when writing this out */ |
78 | 78 | ||
79 | #define BTRFS_ORDERED_UPDATED_ISIZE 7 /* indicates wether this ordered extent | 79 | #define BTRFS_ORDERED_UPDATED_ISIZE 7 /* indicates whether this ordered extent |
80 | * has done its due diligence in updating | 80 | * has done its due diligence in updating |
81 | * the isize. */ | 81 | * the isize. */ |
82 | 82 | ||
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 0f5ebb72a5ea..e3c6ee3cc2ba 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
@@ -4294,7 +4294,7 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio, | |||
4294 | 4294 | ||
4295 | rcu_read_lock(); | 4295 | rcu_read_lock(); |
4296 | name = rcu_dereference(dev->name); | 4296 | name = rcu_dereference(dev->name); |
4297 | pr_debug("btrfs_map_bio: rw %d, secor=%llu, dev=%lu " | 4297 | pr_debug("btrfs_map_bio: rw %d, sector=%llu, dev=%lu " |
4298 | "(%s id %llu), size=%u\n", rw, | 4298 | "(%s id %llu), size=%u\n", rw, |
4299 | (u64)bio->bi_sector, (u_long)dev->bdev->bd_dev, | 4299 | (u64)bio->bi_sector, (u_long)dev->bdev->bd_dev, |
4300 | name->str, dev->devid, bio->bi_size); | 4300 | name->str, dev->devid, bio->bi_size); |
diff --git a/fs/cifs/README b/fs/cifs/README index 22ab7b5b8da7..2d5622f60e11 100644 --- a/fs/cifs/README +++ b/fs/cifs/README | |||
@@ -480,7 +480,7 @@ A partial list of the supported mount options follows: | |||
480 | Unicode on the wire. | 480 | Unicode on the wire. |
481 | nomapchars Do not translate any of these seven characters (default). | 481 | nomapchars Do not translate any of these seven characters (default). |
482 | nocase Request case insensitive path name matching (case | 482 | nocase Request case insensitive path name matching (case |
483 | sensitive is the default if the server suports it). | 483 | sensitive is the default if the server supports it). |
484 | (mount option "ignorecase" is identical to "nocase") | 484 | (mount option "ignorecase" is identical to "nocase") |
485 | posixpaths If CIFS Unix extensions are supported, attempt to | 485 | posixpaths If CIFS Unix extensions are supported, attempt to |
486 | negotiate posix path name support which allows certain | 486 | negotiate posix path name support which allows certain |
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 3c20de1d59d0..df163da388c9 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -2455,7 +2455,7 @@ TAS_BUFFER_FNS(Uninit, uninit) | |||
2455 | BUFFER_FNS(Da_Mapped, da_mapped) | 2455 | BUFFER_FNS(Da_Mapped, da_mapped) |
2456 | 2456 | ||
2457 | /* | 2457 | /* |
2458 | * Add new method to test wether block and inode bitmaps are properly | 2458 | * Add new method to test whether block and inode bitmaps are properly |
2459 | * initialized. With uninit_bg reading the block from disk is not enough | 2459 | * initialized. With uninit_bg reading the block from disk is not enough |
2460 | * to mark the bitmap uptodate. We need to also zero-out the bitmap | 2460 | * to mark the bitmap uptodate. We need to also zero-out the bitmap |
2461 | */ | 2461 | */ |
diff --git a/fs/fhandle.c b/fs/fhandle.c index f775bfdd6e4a..cccdc874bb55 100644 --- a/fs/fhandle.c +++ b/fs/fhandle.c | |||
@@ -22,7 +22,7 @@ static long do_sys_name_to_handle(struct path *path, | |||
22 | struct file_handle *handle = NULL; | 22 | struct file_handle *handle = NULL; |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * We need t make sure wether the file system | 25 | * We need to make sure whether the file system |
26 | * support decoding of the file handle | 26 | * support decoding of the file handle |
27 | */ | 27 | */ |
28 | if (!path->dentry->d_sb->s_export_op || | 28 | if (!path->dentry->d_sb->s_export_op || |
@@ -40,7 +40,7 @@ static long do_sys_name_to_handle(struct path *path, | |||
40 | if (!handle) | 40 | if (!handle) |
41 | return -ENOMEM; | 41 | return -ENOMEM; |
42 | 42 | ||
43 | /* convert handle size to multiple of sizeof(u32) */ | 43 | /* convert handle size to multiple of sizeof(u32) */ |
44 | handle_dwords = f_handle.handle_bytes >> 2; | 44 | handle_dwords = f_handle.handle_bytes >> 2; |
45 | 45 | ||
46 | /* we ask for a non connected handle */ | 46 | /* we ask for a non connected handle */ |
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 4a55f35a6ced..78bde32ea951 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * hugetlbpage-backed filesystem. Based on ramfs. | 2 | * hugetlbpage-backed filesystem. Based on ramfs. |
3 | * | 3 | * |
4 | * William Irwin, 2002 | 4 | * Nadia Yvette Chambers, 2002 |
5 | * | 5 | * |
6 | * Copyright (C) 2002 Linus Torvalds. | 6 | * Copyright (C) 2002 Linus Torvalds. |
7 | */ | 7 | */ |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 7f5120bf0ec2..071d6905f0dd 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -1259,7 +1259,7 @@ int journal_forget (handle_t *handle, struct buffer_head *bh) | |||
1259 | goto not_jbd; | 1259 | goto not_jbd; |
1260 | } | 1260 | } |
1261 | 1261 | ||
1262 | /* keep track of wether or not this transaction modified us */ | 1262 | /* keep track of whether or not this transaction modified us */ |
1263 | was_modified = jh->b_modified; | 1263 | was_modified = jh->b_modified; |
1264 | 1264 | ||
1265 | /* | 1265 | /* |
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index a74ba4659549..d8da40e99d84 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c | |||
@@ -1261,7 +1261,7 @@ int jbd2_journal_forget (handle_t *handle, struct buffer_head *bh) | |||
1261 | goto not_jbd; | 1261 | goto not_jbd; |
1262 | } | 1262 | } |
1263 | 1263 | ||
1264 | /* keep track of wether or not this transaction modified us */ | 1264 | /* keep track of whether or not this transaction modified us */ |
1265 | was_modified = jh->b_modified; | 1265 | was_modified = jh->b_modified; |
1266 | 1266 | ||
1267 | /* | 1267 | /* |
diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c index adb90116d36b..af49e2d6941a 100644 --- a/fs/logfs/inode.c +++ b/fs/logfs/inode.c | |||
@@ -33,7 +33,7 @@ | |||
33 | * are being written out - and waiting for GC to make progress, naturally. | 33 | * are being written out - and waiting for GC to make progress, naturally. |
34 | * | 34 | * |
35 | * So we cannot just call iget() or some variant of it, but first have to check | 35 | * So we cannot just call iget() or some variant of it, but first have to check |
36 | * wether the inode in question might be in I_FREEING state. Therefore we | 36 | * whether the inode in question might be in I_FREEING state. Therefore we |
37 | * maintain our own per-sb list of "almost deleted" inodes and check against | 37 | * maintain our own per-sb list of "almost deleted" inodes and check against |
38 | * that list first. Normally this should be at most 1-2 entries long. | 38 | * that list first. Normally this should be at most 1-2 entries long. |
39 | * | 39 | * |
diff --git a/fs/ncpfs/mmap.c b/fs/ncpfs/mmap.c index be20a7e171a0..63d14a99483d 100644 --- a/fs/ncpfs/mmap.c +++ b/fs/ncpfs/mmap.c | |||
@@ -89,7 +89,7 @@ static int ncp_file_mmap_fault(struct vm_area_struct *area, | |||
89 | /* | 89 | /* |
90 | * If I understand ncp_read_kernel() properly, the above always | 90 | * If I understand ncp_read_kernel() properly, the above always |
91 | * fetches from the network, here the analogue of disk. | 91 | * fetches from the network, here the analogue of disk. |
92 | * -- wli | 92 | * -- nyc |
93 | */ | 93 | */ |
94 | count_vm_event(PGMAJFAULT); | 94 | count_vm_event(PGMAJFAULT); |
95 | mem_cgroup_count_vm_event(area->vm_mm, PGMAJFAULT); | 95 | mem_cgroup_count_vm_event(area->vm_mm, PGMAJFAULT); |
diff --git a/fs/notify/fanotify/Kconfig b/fs/notify/fanotify/Kconfig index 7dceff005a67..e5f911bd80d2 100644 --- a/fs/notify/fanotify/Kconfig +++ b/fs/notify/fanotify/Kconfig | |||
@@ -4,7 +4,7 @@ config FANOTIFY | |||
4 | select ANON_INODES | 4 | select ANON_INODES |
5 | default n | 5 | default n |
6 | ---help--- | 6 | ---help--- |
7 | Say Y here to enable fanotify suport. fanotify is a file access | 7 | Say Y here to enable fanotify support. fanotify is a file access |
8 | notification system which differs from inotify in that it sends | 8 | notification system which differs from inotify in that it sends |
9 | an open file descriptor to the userspace listener along with | 9 | an open file descriptor to the userspace listener along with |
10 | the event. | 10 | the event. |
diff --git a/fs/notify/notification.c b/fs/notify/notification.c index c887b1378f7e..48cb994e4922 100644 --- a/fs/notify/notification.c +++ b/fs/notify/notification.c | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | /* | 19 | /* |
20 | * Basic idea behind the notification queue: An fsnotify group (like inotify) | 20 | * Basic idea behind the notification queue: An fsnotify group (like inotify) |
21 | * sends the userspace notification about events asyncronously some time after | 21 | * sends the userspace notification about events asynchronously some time after |
22 | * the event happened. When inotify gets an event it will need to add that | 22 | * the event happened. When inotify gets an event it will need to add that |
23 | * event to the group notify queue. Since a single event might need to be on | 23 | * event to the group notify queue. Since a single event might need to be on |
24 | * multiple group's notification queues we can't add the event directly to each | 24 | * multiple group's notification queues we can't add the event directly to each |