mirror of
https://github.com/suyu-emu/horinux.git
synced 2026-09-21 14:15:21 -07:00
Merge tag 'docs-4.13' of git://git.lwn.net/linux
Pull documentation updates from Jonathan Corbet:
"There has been a fair amount of activity in the docs tree this time
around. Highlights include:
- Conversion of a bunch of security documentation into RST
- The conversion of the remaining DocBook templates by The Amazing
Mauro Machine. We can now drop the entire DocBook build chain.
- The usual collection of fixes and minor updates"
* tag 'docs-4.13' of git://git.lwn.net/linux: (90 commits)
scripts/kernel-doc: handle DECLARE_HASHTABLE
Documentation: atomic_ops.txt is core-api/atomic_ops.rst
Docs: clean up some DocBook loose ends
Make the main documentation title less Geocities
Docs: Use kernel-figure in vidioc-g-selection.rst
Docs: fix table problems in ras.rst
Docs: Fix breakage with Sphinx 1.5 and upper
Docs: Include the Latex "ifthen" package
doc/kokr/howto: Only send regression fixes after -rc1
docs-rst: fix broken links to dynamic-debug-howto in kernel-parameters
doc: Document suitability of IBM Verse for kernel development
Doc: fix a markup error in coding-style.rst
docs: driver-api: i2c: remove some outdated information
Documentation: DMA API: fix a typo in a function name
Docs: Insert missing space to separate link from text
doc/ko_KR/memory-barriers: Update control-dependencies example
Documentation, kbuild: fix typo "minimun" -> "minimum"
docs: Fix some formatting issues in request-key.rst
doc: ReSTify keys-trusted-encrypted.txt
doc: ReSTify keys-request-key.txt
...
This commit is contained in:
+21
-21
@@ -409,25 +409,6 @@ static handle_t *new_handle(int nblocks)
|
||||
return handle;
|
||||
}
|
||||
|
||||
/**
|
||||
* handle_t *jbd2_journal_start() - Obtain a new handle.
|
||||
* @journal: Journal to start transaction on.
|
||||
* @nblocks: number of block buffer we might modify
|
||||
*
|
||||
* We make sure that the transaction can guarantee at least nblocks of
|
||||
* modified buffers in the log. We block until the log can guarantee
|
||||
* that much space. Additionally, if rsv_blocks > 0, we also create another
|
||||
* handle with rsv_blocks reserved blocks in the journal. This handle is
|
||||
* is stored in h_rsv_handle. It is not attached to any particular transaction
|
||||
* and thus doesn't block transaction commit. If the caller uses this reserved
|
||||
* handle, it has to set h_rsv_handle to NULL as otherwise jbd2_journal_stop()
|
||||
* on the parent handle will dispose the reserved one. Reserved handle has to
|
||||
* be converted to a normal handle using jbd2_journal_start_reserved() before
|
||||
* it can be used.
|
||||
*
|
||||
* Return a pointer to a newly allocated handle, or an ERR_PTR() value
|
||||
* on failure.
|
||||
*/
|
||||
handle_t *jbd2__journal_start(journal_t *journal, int nblocks, int rsv_blocks,
|
||||
gfp_t gfp_mask, unsigned int type,
|
||||
unsigned int line_no)
|
||||
@@ -478,6 +459,25 @@ handle_t *jbd2__journal_start(journal_t *journal, int nblocks, int rsv_blocks,
|
||||
EXPORT_SYMBOL(jbd2__journal_start);
|
||||
|
||||
|
||||
/**
|
||||
* handle_t *jbd2_journal_start() - Obtain a new handle.
|
||||
* @journal: Journal to start transaction on.
|
||||
* @nblocks: number of block buffer we might modify
|
||||
*
|
||||
* We make sure that the transaction can guarantee at least nblocks of
|
||||
* modified buffers in the log. We block until the log can guarantee
|
||||
* that much space. Additionally, if rsv_blocks > 0, we also create another
|
||||
* handle with rsv_blocks reserved blocks in the journal. This handle is
|
||||
* is stored in h_rsv_handle. It is not attached to any particular transaction
|
||||
* and thus doesn't block transaction commit. If the caller uses this reserved
|
||||
* handle, it has to set h_rsv_handle to NULL as otherwise jbd2_journal_stop()
|
||||
* on the parent handle will dispose the reserved one. Reserved handle has to
|
||||
* be converted to a normal handle using jbd2_journal_start_reserved() before
|
||||
* it can be used.
|
||||
*
|
||||
* Return a pointer to a newly allocated handle, or an ERR_PTR() value
|
||||
* on failure.
|
||||
*/
|
||||
handle_t *jbd2_journal_start(journal_t *journal, int nblocks)
|
||||
{
|
||||
return jbd2__journal_start(journal, nblocks, 0, GFP_NOFS, 0, 0);
|
||||
@@ -1072,10 +1072,10 @@ out:
|
||||
* @handle: transaction to add buffer modifications to
|
||||
* @bh: bh to be used for metadata writes
|
||||
*
|
||||
* Returns an error code or 0 on success.
|
||||
* Returns: error code or 0 on success.
|
||||
*
|
||||
* In full data journalling mode the buffer may be of type BJ_AsyncData,
|
||||
* because we're write()ing a buffer which is also part of a shared mapping.
|
||||
* because we're ``write()ing`` a buffer which is also part of a shared mapping.
|
||||
*/
|
||||
|
||||
int jbd2_journal_get_write_access(handle_t *handle, struct buffer_head *bh)
|
||||
|
||||
Reference in New Issue
Block a user