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

From: Trond Myklebust
Date: Mon May 21 2007 - 09:24:22 EST


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@xxxxxxxxxxxxxx>
> ---
> 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;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/