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/notify | |
| 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/notify')
| -rw-r--r-- | fs/notify/fanotify/Kconfig | 2 | ||||
| -rw-r--r-- | fs/notify/notification.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/notify/fanotify/Kconfig b/fs/notify/fanotify/Kconfig index 7dceff005a6..e5f911bd80d 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 c887b1378f7..48cb994e492 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 |