Merge remote-tracking branch 'mauro-exp/docbook3' into death-to-docbook
Mauro says: This patch series convert the remaining DocBooks to ReST. The first version was originally send as 3 patch series: [PATCH 00/36] Convert DocBook documents to ReST [PATCH 0/5] Convert more books to ReST [PATCH 00/13] Get rid of DocBook The lsm book was added as if it were a text file under Documentation. The plan is to merge it with another file under Documentation/security, after both this series and a security Documentation patch series gets merged. It also adjusts some Sphinx-pedantic errors/warnings on some kernel-doc markups. I also added some patches here to add PDF output for all existing ReST books.
Cette révision appartient à :
@@ -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);
|
||||
@@ -1066,10 +1066,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)
|
||||
|
Référencer dans un nouveau ticket
Bloquer un utilisateur