2014-10-09 20:49:30

by Fabian Frédérick

Subject: [PATCH 1/1 linux-next] GFS2: directly return gfs2_dir_check()

No need to store gfs2_dir_check result and test it before returning.

Signed-off-by: Fabian Frederick <[email protected]>
---
fs/gfs2/inode.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index c4ed823..b41b5c7 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -1045,11 +1045,7 @@ static int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name,
if (error)
return error;

- error = gfs2_dir_check(&dip->i_inode, name, ip);
- if (error)
- return error;
-
- return 0;
+ return gfs2_dir_check(&dip->i_inode, name, ip);
}

/**
--
1.9.3

2014-10-10 13:21:36

by Steven Whitehouse

Subject: Re: [PATCH 1/1 linux-next] GFS2: directly return gfs2_dir_check()

Hi,

On 09/10/14 21:49, Fabian Frederick wrote:
> No need to store gfs2_dir_check result and test it before returning.
>
> Signed-off-by: Fabian Frederick <[email protected]>
Since I've already sent a pull request for this merge window, and this
is not urgent, I'll keep this one and use it to start off the new tree
in due course, once the merge window has closed. Thanks,

Steve,

> ---
> fs/gfs2/inode.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
> index c4ed823..b41b5c7 100644
> --- a/fs/gfs2/inode.c
> +++ b/fs/gfs2/inode.c
> @@ -1045,11 +1045,7 @@ static int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name,
> if (error)
> return error;
>
> - error = gfs2_dir_check(&dip->i_inode, name, ip);
> - if (error)
> - return error;
> -
> - return 0;
> + return gfs2_dir_check(&dip->i_inode, name, ip);
> }
>
> /**