Skip to contentSkip to conversation

ext4: extents: Modify the return value variable type and initialize the assignment

PATCH In review Li kunyu 2 participants 2 messages Feb 7, 2023 – Feb 17, 2023 ext4 file system

lore
Share & tools
lore

Li kunyu

author
#0 lore raw

PATCH 1/1 ext4: extents: Modify the return value variable type and initialize the assignment

Modify the return value variable to be consistent with the return value type of the function, and modify the initialization assignment. Under certain circumstances, the constant return value is not required.

---
 fs/ext4/extents.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
fs/ext4/extents.c +3 -3
index 9de1c9d1a13d..debeb2e7a162 100644
@@ -4676,7 +4676,7 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
 	struct inode *inode = file_inode(file);
 	loff_t new_size = 0;
 	unsigned int max_blocks;
-	int ret = 0;
+	long ret = -EOPNOTSUPP;
 	int flags;
 	ext4_lblk_t lblk;
 	unsigned int blkbits = inode->i_blkbits;
@@ -4689,13 +4689,13 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
 	 */
 	if (IS_ENCRYPTED(inode) &&
 	    (mode & (FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_INSERT_RANGE)))
-		return -EOPNOTSUPP;
+		return ret;
 
 	/* Return error if mode is not supported */
 	if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE |
 		     FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_ZERO_RANGE |
 		     FALLOC_FL_INSERT_RANGE))
-		return -EOPNOTSUPP;
+		return ret;
 
 	inode_lock(inode);
 	ret = ext4_convert_inline_data(inode);
Signature · 1 line
2.18.2
reviewer
#1 lore raw
Quoted 5 lines · Li kunyu

Modify the return value variable to be consistent with the return value type of the function, and modify the initialization assignment. Under certain circumstances, the constant return value is not required.

Hum, I don't think this really improves anything. All the functions seem to return 0 or error code (and ext4_fallocate()) as well so the size of return value does not really matter and we usually just use int in this case.

Honza

Quoted 36 lines
---
 fs/ext4/extents.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
fs/ext4/extents.c +3 -3
index 9de1c9d1a13d..debeb2e7a162 100644
@@ -4676,7 +4676,7 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
 	struct inode *inode = file_inode(file);
 	loff_t new_size = 0;
 	unsigned int max_blocks;
-	int ret = 0;
+	long ret = -EOPNOTSUPP;
 	int flags;
 	ext4_lblk_t lblk;
 	unsigned int blkbits = inode->i_blkbits;
@@ -4689,13 +4689,13 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
 	 */
 	if (IS_ENCRYPTED(inode) &&
 	    (mode & (FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_INSERT_RANGE)))
-		return -EOPNOTSUPP;
+		return ret;
 
 	/* Return error if mode is not supported */
 	if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE |
 		     FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_ZERO_RANGE |
 		     FALLOC_FL_INSERT_RANGE))
-		return -EOPNOTSUPP;
+		return ret;
 
 	inode_lock(inode);
 	ret = ext4_convert_inline_data(inode);
Signature · 1 line
2.18.2
Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR