[PATCH 1/1] FS: reiserfs, fix unreachable statement

[PATCH 1/1] FS: reiserfs, fix unreachable statement

[Jiri Slaby]

Stanse found an unreachable statement in reiserfs_ioctl. There is
if followed by assignment and `break'. with no braces. Add the
braces so that we don't break every time, but only in error case.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: reiserfs-devel@vger.kernel.org
---
 fs/reiserfs/ioctl.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c
index ace7745..f53505d 100644
--- a/fs/reiserfs/ioctl.c
+++ b/fs/reiserfs/ioctl.c
@@ -104,9 +104,10 @@ setflags_out:
 		err = put_user(inode->i_generation, (int __user *)arg);
 		break;
 	case REISERFS_IOC_SETVERSION:
-		if (!is_owner_or_cap(inode))
+		if (!is_owner_or_cap(inode)) {
 			err = -EPERM;
 			break;
+		}
 		err = mnt_want_write(filp->f_path.mnt);
 		if (err)
 			break;
-- 
1.6.5.7

Re: [PATCH 1/1] FS: reiserfs, fix unreachable statement

[Frederic Weisbecker]

On Wed, Jan 06, 2010 at 11:09:50PM +0100, Jiri Slaby wrote:
> Stanse found an unreachable statement in reiserfs_ioctl. There is
> if followed by assignment and `break'. with no braces. Add the
> braces so that we don't break every time, but only in error case.
> 
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> Cc: reiserfs-devel@vger.kernel.org
> ---



Looks good.
I've applied it, thanks!



>  fs/reiserfs/ioctl.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c
> index ace7745..f53505d 100644
> --- a/fs/reiserfs/ioctl.c
> +++ b/fs/reiserfs/ioctl.c
> @@ -104,9 +104,10 @@ setflags_out:
>  		err = put_user(inode->i_generation, (int __user *)arg);
>  		break;
>  	case REISERFS_IOC_SETVERSION:
> -		if (!is_owner_or_cap(inode))
> +		if (!is_owner_or_cap(inode)) {
>  			err = -EPERM;
>  			break;
> +		}
>  		err = mnt_want_write(filp->f_path.mnt);
>  		if (err)
>  			break;
> -- 
> 1.6.5.7
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/