Skip to contentSkip to conversation

ext3: remove unneeded check in ext3_ordered_writepage()

PATCH In review Dan Carpenter 2 participants 2 messages Feb 21, 2014 Kernel janitors

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ext3: remove unneeded check in ext3_ordered_writepage()

We already know "ret" is zero so there is no need to do:

		if (!ret)
			ret = err;

We can just assign ret directly instead.

fs/ext3/inode.c +2 -5
index 384b6ebb655f..491f022c476a 100644
@@ -1673,12 +1673,9 @@ static int ext3_ordered_writepage(struct page *page,
 	 * block_write_full_page() succeeded.  Otherwise they are unmapped,
 	 * and generally junk.
 	 */
-	if (ret = 0) {
-		err = walk_page_buffers(handle, page_bufs, 0, PAGE_CACHE_SIZE,
+	if (ret = 0)
+		ret = walk_page_buffers(handle, page_bufs, 0, PAGE_CACHE_SIZE,
 					NULL, journal_dirty_data_fn);
-		if (!ret)
-			ret = err;
-	}
 	walk_page_buffers(handle, page_bufs, 0,
 			PAGE_CACHE_SIZE, NULL, bput_one);
 	err = ext3_journal_stop(handle);
#1 lore raw
Quoted 6 lines · Dan Carpenter

We already know "ret" is zero so there is no need to do:

		if (!ret)
			ret = err;

We can just assign ret directly instead.

Thanks. I've added the patch to my tree.

Honza

Quoted 22 lines
fs/ext3/inode.c +2 -5
index 384b6ebb655f..491f022c476a 100644
@@ -1673,12 +1673,9 @@ static int ext3_ordered_writepage(struct page *page,
 	 * block_write_full_page() succeeded.  Otherwise they are unmapped,
 	 * and generally junk.
 	 */
-	if (ret = 0) {
-		err = walk_page_buffers(handle, page_bufs, 0, PAGE_CACHE_SIZE,
+	if (ret = 0)
+		ret = walk_page_buffers(handle, page_bufs, 0, PAGE_CACHE_SIZE,
 					NULL, journal_dirty_data_fn);
-		if (!ret)
-			ret = err;
-	}
 	walk_page_buffers(handle, page_bufs, 0,
 			PAGE_CACHE_SIZE, NULL, bput_one);
 	err = ext3_journal_stop(handle);
Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR