rpms/kernel/F-7 linux-2.6-nfs-missing-braces.patch, NONE, 1.1 kernel-2.6.spec, 1.3176, 1.3177

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23697

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-nfs-missing-braces.patch 
Log Message:
* Mon May 21 2007 Dave Jones <davej at redhat.com>
- Add missing braces to nfs_readpages()


linux-2.6-nfs-missing-braces.patch:

--- NEW FILE linux-2.6-nfs-missing-braces.patch ---
From:	"Maciej W. Rozycki" <macro at linux-mips.org>
To:	Trond Myklebust <trond.myklebust at fys.uio.no>
cc:	linux-kernel at vger.kernel.org
Subject: [PATCH] 2.6.21: nfs_readpages: Add missing braces
Message-ID: <Pine.LNX.4.64N.0705211402170.8263 at blysk.ds.pg.gda.pl>

 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 at 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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3176
retrieving revision 1.3177
diff -u -r1.3176 -r1.3177
--- kernel-2.6.spec	21 May 2007 20:39:16 -0000	1.3176
+++ kernel-2.6.spec	21 May 2007 21:23:28 -0000	1.3177
@@ -576,6 +576,7 @@
 Patch1690: linux-2.6-PT_LOAD-align.patch
 Patch1700: linux-2.6-dvb-spinlock.patch
 Patch1710: linux-2.6-nfs-noreaddirplus.patch
+Patch1711: linux-2.6-nfs-missing-braces.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
 Patch1730: linux-2.6-suspend-ordering.patch
 Patch1740: linux-2.6-softlockup-disable.patch
@@ -1325,6 +1326,8 @@
 %patch1700 -p1
 # NFS: Added support to turn off the NFSv3 READDIRPLUS RPC.
 %patch1710 -p1
+# Missing braces
+%patch1711 -p1
 # setuid /proc/self/maps fix.
 %patch1720 -p1
 # Fix ACPI suspend / device suspend ordering problem
@@ -2403,6 +2406,9 @@
 %endif
 
 %changelog
+* Mon May 21 2007 Dave Jones <davej at redhat.com>
+- Add missing braces to nfs_readpages()
+
 * Mon May 21 2007 John W. Linville <linville at redhat.com>
 - revamp iwl3945 irq_tasklet patch