2013-09-05 04:04:26

by Dave Jones

Subject: [PATCH] Fix missing braces in ncpfs:ncp_lookup

Signed-off-by: Dave Jones <[email protected]>

diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
index 3be0474..1f6419f 100644
--- a/fs/ncpfs/dir.c
+++ b/fs/ncpfs/dir.c
@@ -857,10 +857,11 @@ static struct dentry *ncp_lookup(struct inode *dir, struct dentry *dentry, unsig
if (ncp_is_server_root(dir)) {
res = ncp_io2vol(server, __name, &len, dentry->d_name.name,
dentry->d_name.len, 1);
- if (!res)
+ if (!res) {
res = ncp_lookup_volume(server, __name, &(finfo.i));
if (!res)
ncp_update_known_namespace(server, finfo.i.volNumber, NULL);
+ }
} else {
res = ncp_io2vol(server, __name, &len, dentry->d_name.name,
dentry->d_name.len, !ncp_preserve_case(dir));

2013-09-05 04:17:39

by Joe Perches

Subject: Re: [PATCH] Fix missing braces in ncpfs:ncp_lookup

(adding Petr Vandrovec to cc's)

> diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
[]
> @@ -857,10 +857,11 @@ static struct dentry *ncp_lookup(struct inode *dir, struct dentry *dentry, unsig
> if (ncp_is_server_root(dir)) {
> res = ncp_io2vol(server, __name, &len, dentry->d_name.name,
> dentry->d_name.len, 1);
> - if (!res)
> + if (!res) {
> res = ncp_lookup_volume(server, __name, &(finfo.i));
> if (!res)
> ncp_update_known_namespace(server, finfo.i.volNumber, NULL);
> + }

2013-09-05 04:29:20

by Al Viro

Subject: Re: [PATCH] Fix missing braces in ncpfs:ncp_lookup

On Thu, Sep 05, 2013 at 12:04:18AM -0400, Dave Jones wrote:
> Signed-off-by: Dave Jones <[email protected]>
>
> diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
> index 3be0474..1f6419f 100644
> --- a/fs/ncpfs/dir.c
> +++ b/fs/ncpfs/dir.c
> @@ -857,10 +857,11 @@ static struct dentry *ncp_lookup(struct inode *dir, struct dentry *dentry, unsig
> if (ncp_is_server_root(dir)) {
> res = ncp_io2vol(server, __name, &len, dentry->d_name.name,
> dentry->d_name.len, 1);
> - if (!res)
> + if (!res) {
> res = ncp_lookup_volume(server, __name, &(finfo.i));
> if (!res)
> ncp_update_known_namespace(server, finfo.i.volNumber, NULL);
> + }

That, or shift two lines one indent level out ;-) I mean,
if (!foo)
foo = bar();
if (!foo)
baz();
is provably equivalent to
if (!foo) {
foo = bar();
if (!foo)
baz();
}

I agree that the current form shouldn't be left as-is - the kernel isn't
IOCCC and all such. The only question is which variant would read better...