diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:20:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:20:59 -0400 |
| commit | f39d01be4c59a61a08d0cb53f615e7016b85d339 (patch) | |
| tree | 6777590e3ff2ddf4df1d38444ba7d692cd463b7b /Documentation/filesystems/Locking | |
| parent | 54291263519ac2c9bdda68b23b02fef3808deed4 (diff) | |
| parent | 7db82437cfcac4bdfe79a6323eb554fdfa271623 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
vlynq: make whole Kconfig-menu dependant on architecture
add descriptive comment for TIF_MEMDIE task flag declaration.
EEPROM: max6875: Header file cleanup
EEPROM: 93cx6: Header file cleanup
EEPROM: Header file cleanup
agp: use NULL instead of 0 when pointer is needed
rtc-v3020: make bitfield unsigned
PCI: make bitfield unsigned
jbd2: use NULL instead of 0 when pointer is needed
cciss: fix shadows sparse warning
doc: inode uses a mutex instead of a semaphore.
uml: i386: Avoid redefinition of NR_syscalls
fix "seperate" typos in comments
cocbalt_lcdfb: correct sections
doc: Change urls for sparse
Powerpc: wii: Fix typo in comment
i2o: cleanup some exit paths
Documentation/: it's -> its where appropriate
UML: Fix compiler warning due to missing task_struct declaration
UML: add kernel.h include to signal.c
...
Diffstat (limited to 'Documentation/filesystems/Locking')
| -rw-r--r-- | Documentation/filesystems/Locking | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index 06bbbed71206..af1608070cd5 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
| @@ -178,7 +178,7 @@ prototypes: | |||
| 178 | locking rules: | 178 | locking rules: |
| 179 | All except set_page_dirty may block | 179 | All except set_page_dirty may block |
| 180 | 180 | ||
| 181 | BKL PageLocked(page) i_sem | 181 | BKL PageLocked(page) i_mutex |
| 182 | writepage: no yes, unlocks (see below) | 182 | writepage: no yes, unlocks (see below) |
| 183 | readpage: no yes, unlocks | 183 | readpage: no yes, unlocks |
| 184 | sync_page: no maybe | 184 | sync_page: no maybe |
| @@ -429,7 +429,7 @@ check_flags: no | |||
| 429 | implementations. If your fs is not using generic_file_llseek, you | 429 | implementations. If your fs is not using generic_file_llseek, you |
| 430 | need to acquire and release the appropriate locks in your ->llseek(). | 430 | need to acquire and release the appropriate locks in your ->llseek(). |
| 431 | For many filesystems, it is probably safe to acquire the inode | 431 | For many filesystems, it is probably safe to acquire the inode |
| 432 | semaphore. Note some filesystems (i.e. remote ones) provide no | 432 | mutex. Note some filesystems (i.e. remote ones) provide no |
| 433 | protection for i_size so you will need to use the BKL. | 433 | protection for i_size so you will need to use the BKL. |
| 434 | 434 | ||
| 435 | Note: ext2_release() was *the* source of contention on fs-intensive | 435 | Note: ext2_release() was *the* source of contention on fs-intensive |