diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 01:15:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 01:15:42 -0500 |
| commit | a2e5790d841658485d642196dbb0927303d6c22f (patch) | |
| tree | b3d28c9bcb7da6880806146fd22a88a7ee7f733e /ipc/util.c | |
| parent | ab2d92ad881da11331280aedf612d82e61cb6d41 (diff) | |
| parent | 60c3e026d73ccabb075fb70ba02f8512ab40cf2c (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc updates from Andrew Morton:
- kasan updates
- procfs
- lib/bitmap updates
- other lib/ updates
- checkpatch tweaks
- rapidio
- ubsan
- pipe fixes and cleanups
- lots of other misc bits
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (114 commits)
Documentation/sysctl/user.txt: fix typo
MAINTAINERS: update ARM/QUALCOMM SUPPORT patterns
MAINTAINERS: update various PALM patterns
MAINTAINERS: update "ARM/OXNAS platform support" patterns
MAINTAINERS: update Cortina/Gemini patterns
MAINTAINERS: remove ARM/CLKDEV SUPPORT file pattern
MAINTAINERS: remove ANDROID ION pattern
mm: docs: add blank lines to silence sphinx "Unexpected indentation" errors
mm: docs: fix parameter names mismatch
mm: docs: fixup punctuation
pipe: read buffer limits atomically
pipe: simplify round_pipe_size()
pipe: reject F_SETPIPE_SZ with size over UINT_MAX
pipe: fix off-by-one error when checking buffer limits
pipe: actually allow root to exceed the pipe buffer limits
pipe, sysctl: remove pipe_proc_fn()
pipe, sysctl: drop 'min' parameter from pipe-max-size converter
kasan: rework Kconfig settings
crash_dump: is_kdump_kernel can be boolean
kernel/mutex: mutex_is_locked can be boolean
...
Diffstat (limited to 'ipc/util.c')
| -rw-r--r-- | ipc/util.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ipc/util.c b/ipc/util.c index ff045fec8d83..4ed5a17dd06f 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
| @@ -23,9 +23,12 @@ | |||
| 23 | * tree. | 23 | * tree. |
| 24 | * - perform initial checks (capabilities, auditing and permission, | 24 | * - perform initial checks (capabilities, auditing and permission, |
| 25 | * etc). | 25 | * etc). |
| 26 | * - perform read-only operations, such as STAT, INFO commands. | 26 | * - perform read-only operations, such as INFO command, that |
| 27 | * do not demand atomicity | ||
| 27 | * acquire the ipc lock (kern_ipc_perm.lock) through | 28 | * acquire the ipc lock (kern_ipc_perm.lock) through |
| 28 | * ipc_lock_object() | 29 | * ipc_lock_object() |
| 30 | * - perform read-only operations that demand atomicity, | ||
| 31 | * such as STAT command. | ||
| 29 | * - perform data updates, such as SET, RMID commands and | 32 | * - perform data updates, such as SET, RMID commands and |
| 30 | * mechanism-specific operations (semop/semtimedop, | 33 | * mechanism-specific operations (semop/semtimedop, |
| 31 | * msgsnd/msgrcv, shmat/shmdt). | 34 | * msgsnd/msgrcv, shmat/shmdt). |