[PATCH 1/2] jfs: Jump to error_out when filemap_fdatawait fails

[PATCH 1/2] jfs: Jump to error_out when filemap_fdatawait fails

[Quorum Laval]

filemap_fdatawait may fail, so check the return value and jump to
error_out in the case of error.

Signed-off-by: Quorum Laval <quorum.laval@gmail.com>
---
 fs/jfs/resize.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fs/jfs/resize.c b/fs/jfs/resize.c
index 90b3bc2..b0322da 100644
--- a/fs/jfs/resize.c
+++ b/fs/jfs/resize.c
@@ -379,7 +379,10 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
 	 * cached in meta-data cache, and not written out
 	 * by txCommit();
 	 */
-	filemap_fdatawait(ipbmap->i_mapping);
+	rc = filemap_fdatawait(ipbmap->i_mapping);
+	if (rc)
+		goto error_out;
+
 	filemap_write_and_wait(ipbmap->i_mapping);
 	diWriteSpecial(ipbmap, 0);
 
-- 
1.9.1

[PATCH 2/2] jfs: jump to error_out when filemap_write_and_wait fails

[Quorum Laval]

filemap_write_and_wait may fails, so check the return value and jump to
error_out in the case of error.

Signed-off-by: Quorum Laval <quorum.laval@gmail.com>
---
 fs/jfs/resize.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fs/jfs/resize.c b/fs/jfs/resize.c
index b0322da..bd9b641 100644
--- a/fs/jfs/resize.c
+++ b/fs/jfs/resize.c
@@ -383,7 +383,10 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
 	if (rc)
 		goto error_out;
 
-	filemap_write_and_wait(ipbmap->i_mapping);
+	rc = filemap_write_and_wait(ipbmap->i_mapping);
+	if (rc)
+		goto error_out;
+
 	diWriteSpecial(ipbmap, 0);
 
 	newPage = nPages;	/* first new page number */
-- 
1.9.1

Re: [PATCH 1/2] jfs: Jump to error_out when filemap_fdatawait fails

[Dave Kleikamp]

On 08/22/2016 03:28 PM, Quorum Laval wrote:
> filemap_fdatawait may fail, so check the return value and jump to
> error_out in the case of error.
> 
> Signed-off-by: Quorum Laval <quorum.laval@gmail.com>

These look good, but I don't see why these shouldn't be combined into a
single patch.

Thanks,
Dave

> ---
>  fs/jfs/resize.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/jfs/resize.c b/fs/jfs/resize.c
> index 90b3bc2..b0322da 100644
> --- a/fs/jfs/resize.c
> +++ b/fs/jfs/resize.c
> @@ -379,7 +379,10 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
>  	 * cached in meta-data cache, and not written out
>  	 * by txCommit();
>  	 */
> -	filemap_fdatawait(ipbmap->i_mapping);
> +	rc = filemap_fdatawait(ipbmap->i_mapping);
> +	if (rc)
> +		goto error_out;
> +
>  	filemap_write_and_wait(ipbmap->i_mapping);
>  	diWriteSpecial(ipbmap, 0);
>  
>