[PATCH] 2.6.21: nfs_readpages: Add missing braces

[PATCH] 2.6.21: nfs_readpages: Add missing braces

[Maciej W. Rozycki]

 A change a while ago added a call to gather statistics to a conditional 
statement, but braces were missed on that occasion resulting in a change 
of semanticts.  This a change to rectify.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
---
 It should be obvious -- please apply.

  Maciej

patch-mips-2.6.18-20060920-nfs_readpages-0
diff -up --recursive --new-file linux-mips-2.6.18-20060920.macro/fs/nfs/read.c linux-mips-2.6.18-20060920/fs/nfs/read.c
--- linux-mips-2.6.18-20060920.macro/fs/nfs/read.c	2006-09-20 14:20:24.000000000 +0000
+++ linux-mips-2.6.18-20060920/fs/nfs/read.c	2007-05-20 15:01:31.000000000 +0000
@@ -696,9 +696,10 @@ int nfs_readpages(struct file *filp, str
 	ret = read_cache_pages(mapping, pages, readpage_async_filler, &desc);
 	if (!list_empty(&head)) {
 		int err = nfs_pagein_list(&head, server->rpages);
-		if (!ret)
+		if (!ret) {
 			nfs_add_stats(inode, NFSIOS_READPAGES, err);
 			ret = err;
+		}
 	}
 	put_nfs_open_context(desc.ctx);
 	return ret;

Re: [PATCH] 2.6.21: nfs_readpages: Add missing braces

[Trond Myklebust]

On Mon, 2007-05-21 at 14:09 +0100, Maciej W. Rozycki wrote:
> A change a while ago added a call to gather statistics to a conditional 
> statement, but braces were missed on that occasion resulting in a change 
> of semanticts.  This a change to rectify.

So you are proposing this as a stable update? It won't apply on
2.6.22-rc2.

Cheers
  Trond

> Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
> ---
>  It should be obvious -- please apply.
> 
>   Maciej
> 
> patch-mips-2.6.18-20060920-nfs_readpages-0
> diff -up --recursive --new-file linux-mips-2.6.18-20060920.macro/fs/nfs/read.c linux-mips-2.6.18-20060920/fs/nfs/read.c
> --- linux-mips-2.6.18-20060920.macro/fs/nfs/read.c	2006-09-20 14:20:24.000000000 +0000
> +++ linux-mips-2.6.18-20060920/fs/nfs/read.c	2007-05-20 15:01:31.000000000 +0000
> @@ -696,9 +696,10 @@ int nfs_readpages(struct file *filp, str
>  	ret = read_cache_pages(mapping, pages, readpage_async_filler, &desc);
>  	if (!list_empty(&head)) {
>  		int err = nfs_pagein_list(&head, server->rpages);
> -		if (!ret)
> +		if (!ret) {
>  			nfs_add_stats(inode, NFSIOS_READPAGES, err);
>  			ret = err;
> +		}
>  	}
>  	put_nfs_open_context(desc.ctx);
>  	return ret;

Re: [PATCH] 2.6.21: nfs_readpages: Add missing braces

[Maciej W. Rozycki]

On Mon, 21 May 2007, Trond Myklebust wrote:

> > A change a while ago added a call to gather statistics to a conditional 
> > statement, but braces were missed on that occasion resulting in a change 
> > of semanticts.  This a change to rectify.
> 
> So you are proposing this as a stable update? It won't apply on
> 2.6.22-rc2.

 I have tried the patch on 2.6.21 and have missed the function in question 
has been since updated.  Sorry about that.  If you think the change is 
important-enough to be applied on a stable branch, the please go ahead, 
otherwise feel free to discard it.

  Maciej