nilfs2-correct-return-value-kernel-doc-descriptions-for-the-rest.patch removed from -mm tree
The quilt patch titled
Subject: nilfs2: correct return value kernel-doc descriptions for the rest
has been removed from the -mm tree. Its filename was
nilfs2-correct-return-value-kernel-doc-descriptions-for-the-rest.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Ryusuke Konishi <[email protected]>
Subject: nilfs2: correct return value kernel-doc descriptions for the rest
Date: Fri, 10 Jan 2025 10:01:48 +0900
Similar to the previous changes to fix return value descriptions, this fixes the format of the return value descriptions of functions for the rest.
---
fs/nilfs2/gcinode.c | 24 ++++++++------------ fs/nilfs2/inode.c | 12 ++-------- fs/nilfs2/recovery.c | 32 ++++++++++---------------- fs/nilfs2/segbuf.c | 12 +--------- fs/nilfs2/segment.c | 48 +++++++++++++++------------------------- fs/nilfs2/the_nilfs.c | 12 ++++------ 6 files changed, 50 insertions(+), 90 deletions(-)
fs/nilfs2/gcinode.c renamed from fs/nilfs2/gcinode.c~nilfs2-correct-return-value-kernel-doc-descriptions-for-the-rest +10 -14
@@ -46,14 +46,11 @@* specified by @pbn to the GC pagecache with the key @blkoff. * This function sets @vbn (@pbn if @vbn is zero) in b_blocknr of the buffer. * -* Return Value: On success, 0 is returned. On Error, one of the following -* negative error code is returned. -* -* %-EIO - I/O error. -* -* %-ENOMEM - Insufficient amount of memory available. -* -* %-ENOENT - The block specified with @pbn does not exist. +* Return: 0 on success, or one of the following negative error codes on +* failure: +* * %-EIO - I/O error (including metadata corruption). +* * %-ENOENT - The block specified with @pbn does not exist. +* * %-ENOMEM - Insufficient memory available. */ int nilfs_gccache_submit_read_data(struct inode *inode, sector_t blkoff, sector_t pbn, __u64 vbn,
@@ -114,12 +111,11 @@ int nilfs_gccache_submit_read_data(struc* specified by @vbn to the GC pagecache. @pbn can be supplied by the * caller to avoid translation of the disk block address. * -* Return Value: On success, 0 is returned. On Error, one of the following -* negative error code is returned. -* -* %-EIO - I/O error. -* -* %-ENOMEM - Insufficient amount of memory available. +* Return: 0 on success, or one of the following negative error codes on +* failure: +* * %-EIO - I/O error (including metadata corruption). +* * %-ENOENT - Invalid virtual block address. +* * %-ENOMEM - Insufficient memory available. */ int nilfs_gccache_submit_read_node (struct inode *inode,sector_t pbn,__u64 vbn,struct buffer_head **out_bh)
fs/nilfs2/inode.c renamed from fs/nilfs2/inode.c~nilfs2-correct-return-value-kernel-doc-descriptions-for-the-rest +3 -9
@@ -598,10 +598,7 @@ struct inode *nilfs_iget_for_gc(struct s* or does nothing if the inode already has it. This function allocates * an additional inode to maintain page cache of B-tree nodes one-on-one. * -* Return Value: On success, 0 is returned. On errors, one of the following -* negative error code is returned. -* -* %-ENOMEM - Insufficient memory available. +* Return: 0 on success, or %-ENOMEM if memory is insufficient. */ int nilfs_attach_btree_node_cache (struct inode *inode) {
@@ -660,11 +657,8 @@ void nilfs_detach_btree_node_cache(struc* in one inode and the one for b-tree node pages is set up in the * other inode, which is attached to the former inode. * -* Return Value: On success, a pointer to the inode for data pages is -* returned. On errors, one of the following negative error code is returned -* in a pointer type. -* -* %-ENOMEM - Insufficient memory available. +* Return: a pointer to the inode for data pages on success, or %-ENOMEM +* if memory is insufficient. */ struct inode *nilfs_iget_for_shadow (struct inode *inode) {
fs/nilfs2/recovery.c renamed from fs/nilfs2/recovery.c~nilfs2-correct-return-value-kernel-doc-descriptions-for-the-rest +12 -20
@@ -754,18 +754,13 @@ static void nilfs_abort_roll_forward(str* @sb: super block instance * @ri: pointer to a nilfs_recovery_info struct to store search results. * -* Return Value: On success, 0 is returned. On error, one of the following -* negative error code is returned. -* -* %-EINVAL - Inconsistent filesystem state. -* -* %-EIO - I/O error -* -* %-ENOSPC - No space left on device (only in a panic state). -* -* %-ERESTARTSYS - Interrupted. -* -* %-ENOMEM - Insufficient memory available. +* Return: 0 on success, or one of the following negative error codes on +* failure: +* * %-EINVAL - Inconsistent filesystem state. +* * %-EIO - I/O error. +* * %-ENOMEM - Insufficient memory available. +* * %-ENOSPC - No space left on device (only in a panic state). +* * %-ERESTARTSYS - Interrupted. */ int nilfs_salvage_orphan_logs(struct the_nilfs *nilfs, struct super_block *sb,
@@ -830,14 +825,11 @@ failed:* segment pointed by the superblock. It sets up struct the_nilfs through * this search. It fills nilfs_recovery_info (ri) required for recovery. * -* Return Value: On success, 0 is returned. On error, one of the following -* negative error code is returned. -* -* %-EINVAL - No valid segment found -* -* %-EIO - I/O error -* -* %-ENOMEM - Insufficient memory available. +* Return: 0 on success, or one of the following negative error codes on +* failure: +* * %-EINVAL - No valid segment found. +* * %-EIO - I/O error. +* * %-ENOMEM - Insufficient memory available. */ int nilfs_search_super_root (struct the_nilfs *nilfs,struct nilfs_recovery_info *ri)
fs/nilfs2/segbuf.c renamed from fs/nilfs2/segbuf.c~nilfs2-correct-return-value-kernel-doc-descriptions-for-the-rest +2 -10
@@ -406,12 +406,7 @@ static int nilfs_segbuf_submit_bh(struct* @segbuf: buffer storing a log to be written * @nilfs: nilfs object * -* Return Value: On Success, 0 is returned. On Error, one of the following -* negative error code is returned. -* -* %-EIO - I/O error -* -* %-ENOMEM - Insufficient memory available. +* Return: Always 0. */ static int nilfs_segbuf_write (struct nilfs_segment_buffer *segbuf,struct the_nilfs *nilfs)
@@ -452,10 +447,7 @@ static int nilfs_segbuf_write(struct nil* nilfs_segbuf_wait - wait for completion of requested BIOs * @segbuf: segment buffer * -* Return Value: On Success, 0 is returned. On Error, one of the following -* negative error code is returned. -* -* %-EIO - I/O error +* Return: 0 on success, or %-EIO if I/O error is detected. */ static int nilfs_segbuf_wait (struct nilfs_segment_buffer *segbuf) {
fs/nilfs2/segment.c renamed from fs/nilfs2/segment.c~nilfs2-correct-return-value-kernel-doc-descriptions-for-the-rest +18 -30
66 lines not on this page · raw message
fs/nilfs2/the_nilfs.c renamed from fs/nilfs2/the_nilfs.c~nilfs2-correct-return-value-kernel-doc-descriptions-for-the-rest +5 -7
@@ -49,8 +49,8 @@ void nilfs_set_last_segment(struct the_n* alloc_nilfs - allocate a nilfs object * @sb: super block instance * -* Return Value: On success, pointer to the_nilfs is returned. -* On error, NULL is returned. +* Return: a pointer to the allocated nilfs object on success, or NULL on +* failure. */ struct the_nilfs *alloc_nilfs (struct super_block *sb) {
@@ -200,8 +200,7 @@ static int nilfs_store_log_cursor(struct* exponent information written in @sbp and stores it in @blocksize, * or aborts with an error message if it's too large. * -* Return Value: On success, 0 is returned. If the block size is too -* large, -EINVAL is returned. +* Return: 0 on success, or %-EINVAL if the block size is too large. */ static int nilfs_get_blocksize (struct super_block *sb,struct nilfs_super_block *sbp,int *blocksize)
@@ -538,7 +537,7 @@ static int nilfs_valid_sb(struct nilfs_s* area, or if the parameters themselves are not normal, it is * determined to be invalid. * -* Return Value: true if invalid, false if valid. +* Return: true if invalid, false if valid. */ static bool nilfs_sb2_bad_offset (struct nilfs_super_block *sbp,u64 offset) {
@@ -684,8 +683,7 @@ static int nilfs_load_super_block(struct* reading the super block, getting disk layout information, initializing * shared fields in the_nilfs). * -* Return Value: On success, 0 is returned. On error, a negative error -* code is returned. +* Return: 0 on success, or a negative error code on failure. */ int init_nilfs (struct the_nilfs *nilfs,struct super_block *sb) {
_
Patches currently in -mm which might be from [email protected] are