commit 0782588b63d0a4307fd277b35c449a17bc59ccc0 Merge: d694c16... c3f49bc... Author: Linus Torvalds Date: Wed Mar 7 10:09:12 2007 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: [GFS2] Fix bz 229873, alternate test: assertion "!ip->i_inode.i_mapping->nrpages" failed [GFS2] build fix [GFS2] go_drop_bh is never used, so remove it [GFS2] Remove unused variable [GFS2] Fix bz 229831, lookup returns wrong inode [GFS2] Fix bz 230143, incorrect flushing of rgrps [GFS2] pass formal ino in do_filldir_main [DLM] fs/dlm/user.c should #include "user.h" [GFS2] fix hangup when multiple processes are trying to write to the same file [GFS2] NFS filehandle check [GFS2] add newline to printk message [GFS2] fix locking mistake commit c3f49bc209b28d2b5f82b78baaa827eb3a4d1891 Author: Steven Whitehouse Date: Wed Mar 7 09:06:48 2007 +0000 [GFS2] Fix bz 229873, alternate test: assertion "!ip->i_inode.i_mapping->nrpages" failed The following removes an incorrect assertion from the GFS2 glops code. This fixes Red Hat bz 229873. Thanks to Abhijith Das for testing the patch and confirming the fix. Signed-off-by: Steven Whitehouse Cc: Abhijith Das commit 95d97b7dd7d7a7a13d11a38b3ecb64849d2e5086 Author: akpm@linux-foundation.org Date: Mon Mar 5 23:10:39 2007 -0800 [GFS2] build fix fs/gfs2/glock.c:2198: error: 'THIS_MODULE' undeclared here (not in a function) Cc: Steven Whitehouse Signed-off-by: Andrew Morton commit 631c42e170564108423fa4073531db159f2523ea Author: Steven Whitehouse Date: Thu Mar 1 10:36:32 2007 +0000 [GFS2] go_drop_bh is never used, so remove it The ->go_drop_bh function is never used, so this removes it and the single caller, Signed-off-by: Steven Whitehouse commit 04b159b132c0d8e92dae8c72f134fd5b13b43deb Author: Steven Whitehouse Date: Thu Mar 1 11:14:44 2007 +0000 [GFS2] Remove unused variable Remove an unused variable. Signed-off-by: Steven Whitehouse commit 1be3867955731b5cb2dc14060cc46f0882e87873 Author: Steven Whitehouse Date: Thu Mar 1 10:00:53 2007 +0000 [GFS2] Fix bz 229831, lookup returns wrong inode The following patch fixes Red Hat bz 229831. Without this patch its possible for the wrong inode to be returned in certain cases. It is a pretty unusual event, so that its taken some time to track down. Thanks and due to Josef Whiter who did a lot of the testing required to thrack this down and fix it. Signed-off-by: Steven Whitehouse commit cad5b9392754910ee7dbe551eb004010a864c882 Author: Steven Whitehouse Date: Wed Feb 28 14:03:00 2007 +0000 [GFS2] Fix bz 230143, incorrect flushing of rgrps The below patch fixes a problem where we were not flushing rgrps correctly. It only occurred in the specific case that a callback was received for an rgrp which was dirty and when a journal log flush had not already resulted in the rgrp being flushed anyway. This fixes Red Hat bz 230143, Signed-off-by: Steven Whitehouse commit fb0d3bce8e88cca4abb26076f778f64edcaf19aa Author: Wendy Cheng Date: Wed Feb 28 11:24:25 2007 -0500 [GFS2] pass formal ino in do_filldir_main ok, the following is the minimum changes to get NFSD going before we settle down this issue .. would appreciate this in the tree so other NFS related works can get done in parallel. Signed-off-by: S. Wendy Cheng Signed-off-by: Steven Whitehouse commit 84c6e8cd359adc34d21e40efcafe09297510b3c8 Author: Adrian Bunk Date: Mon Feb 26 00:18:42 2007 +0100 [DLM] fs/dlm/user.c should #include "user.h" Every file should include the headers containing the prototypes for it's global functions. Signed-off-by: Adrian Bunk Signed-off-by: Steven Whitehouse commit a13cbe375303585fec1425135ed54adb62be41fc Author: Josef Whiter Date: Fri Feb 23 12:49:51 2007 -0500 [GFS2] fix hangup when multiple processes are trying to write to the same file This fixes a problem I encountered while running bonnie++. When you have one thread that opens a file and starts to write to it, and then another thread that tries to open and write to the same file, the second thread will loop forever trying to grab the inode lock for that inode. Basically we come in through generic_buffered_file_write, which calls gfs2_prepare_write, which then attempts to grab the glock. Because we don't own the lock, gfs2_prepare_write gets GLR_TRYFAILED, which returns AOP_TRUNCATED_PAGE to generic_buffered_file_write. At this point generic_buffered_file_write loops around again and immediately retries the prepare_write. This means that the second process never gets off of the processor in order to allow the process that holds the lock to finish its work and let go of the lock. This patch makes gfs2_glock_nq schedule() if it gets back a GLR_TRYFAILED, which resolves this problem. Signed-off-by: Josef Whiter Signed-off-by: Steven Whitehouse commit a7d2b2bdc9a0b55d5b08e15756c7e65c48c4bca5 Author: Wendy Cheng Date: Fri Feb 23 00:21:17 2007 -0500 [GFS2] NFS filehandle check File handle checking error found in '07 NFS connectathon. The fh_type and fh_len are not necessarily identical. Some of the client machines could fail mount with stale filehandle without this patch. Signed-off-by: S. Wendy Cheng Signed-off-by: Steven Whitehouse commit d5a6751b32c79680da90eaa76919ffe6e5b8a94f Author: Richard Fearn Date: Sat Feb 17 17:29:15 2007 +0000 [GFS2] add newline to printk message Patch for the 2.6.20 stable tree that adds a missing newline to one of the printk messages in fs/gfs2/ops_fstype.c. Signed-off-by: Richard Fearn Signed-off-by: Steven Whitehouse commit 2e95b6653bb69c893e6ee1b42b537939c1ea2b9c Author: Josef Whiter Date: Tue Feb 20 00:03:29 2007 -0500 [GFS2] fix locking mistake This patch fixes a locking mistake in the quota code, we do a mutex_lock instead of a mutex_unlock. Signed-off-by: Josef Whiter Signed-off-by: Steven Whitehouse commit d694c16bc332c7e706f44e3d10bea06228166a6f Merge: d04f41e... ccd45ad... Author: Linus Torvalds Date: Wed Mar 7 10:08:33 2007 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Kill off I/O cruft for R7780RP. sh: Revert lazy dcache writeback changes. sh: Enable SM501 support for RTS7751R2D. sh: Use L1_CACHE_BYTES for .data.cacheline_aligned. sysctl: Support vdso_enabled sysctl on SH. sh: Fix kernel thread stack corruption with preempt. doc: Add SH to vdso and earlyprintk in kernel-parameters.txt sh: Fix sigmask trampling in signal delivery. sh: Clear UBC when not in use. commit d04f41e35343f1d788551fd3f753f51794f4afcf Author: Ingo Molnar Date: Wed Mar 7 18:12:31 2007 +0100 [PATCH] CPU hotplug: call check_tsc_sync_source() with irqs off check_tsc_sync_source() depends on being called with irqs disabled (it checks whether the TSC is coherent across two specific CPUs). This is incidentally true during bootup, but not during cpu hotplug __cpu_up(). This got found via smp_processor_id() debugging. disable irqs explicitly and remove the unconditional enabling of interrupts. Add touch_nmi_watchdog() to the cpu_online_map busy loop. this bug is present both on i386 and on x86_64. Reported-by: Michal Piotrowski Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit ccd45ad405bcb1504bd923bd0487902374c942c8 Author: Paul Mundt Date: Mon Mar 5 20:19:57 2007 +0900 sh: Kill off I/O cruft for R7780RP. We don't have any use for these machvec fixups anymore, kill them all off and go with the generic instead. Signed-off-by: Paul Mundt commit 39e688a94b94eaba768b1494e19e96f828fc2688 Author: Paul Mundt Date: Mon Mar 5 19:46:47 2007 +0900 sh: Revert lazy dcache writeback changes. These ended up causing too many problems on older parts, revert for now.. Signed-off-by: Paul Mundt commit c87a7111349891043cb0a62b0ba745264d4b600a Author: Paul Mundt Date: Thu Mar 1 18:47:08 2007 +0900 sh: Enable SM501 support for RTS7751R2D. This enables the SM501 drivers for the R2D board. Additional work needs to be done to migrate off of the VoyagerGX cchip code to make use of the rest of the mfd infrastructure. Signed-off-by: Paul Mundt commit 87e29cacb7d09c81b09224bec395f970df958af4 Author: Paul Mundt Date: Thu Mar 1 15:56:31 2007 +0900 sh: Use L1_CACHE_BYTES for .data.cacheline_aligned. Previously this was using a hardcoded 32, use L1_CACHE_BYTES for cacheline alignment instead. Signed-off-by: Paul Mundt commit 5c36e6578d81f79ede871d3e66a0d6beeffeb3dc Author: Paul Mundt Date: Thu Mar 1 10:07:42 2007 +0900 sysctl: Support vdso_enabled sysctl on SH. All of the logic for this was already in place, we just hadn't wired it up in the sysctl table. Signed-off-by: Paul Mundt commit e6bcf562e58662b9765748d346e4c076b20e3aa5 Author: Hideo Saito Date: Wed Feb 28 18:35:42 2007 +0900 sh: Fix kernel thread stack corruption with preempt. When I run a preemptive kernel-2.6.20 for SH7780, a created kthread(pdflush) can not exit by do_exit() in kernel_thread_helper. I think that the created kthread should have a room for 'struct pt_regs' space on the stack top, because __switch_to() will refer to the space as follows using 'regs = task_pt_regs(prev)' and next condition may be true. Signed-off-by: Hideo Saito Signed-off-by: Paul Mundt commit e523d93c8487667552dd29ff756d6ea6bce30851 Author: Paul Mundt Date: Wed Feb 28 18:30:01 2007 +0900 doc: Add SH to vdso and earlyprintk in kernel-parameters.txt SH supports both of these options, add it to the docs. Signed-off-by: Paul Mundt commit c8bfa1fdc84af7b5e3c7f825a9f0bc6e8a19f5d5 Author: Ryusuke Sakato Date: Fri Feb 23 13:22:56 2007 +0900 sh: Fix sigmask trampling in signal delivery. There was a missing return in do_signal() that caused the saved sigmask to be written back after having successfully delivered the signal. Signed-off-by: Ryusuke Sakato Signed-off-by: Paul Mundt commit 9432f96803139adaff0cd9f4fa38b7fb99cda366 Author: Stuart Menefy Date: Fri Feb 23 13:22:17 2007 +0900 sh: Clear UBC when not in use. This takes care of tearing down the UBC so it's not inadvertently left configured at the next context switch time. Failure to do this results in spurious SIGTRAPs in certain debug sequences. Signed-off-by: Stuart Menefy Signed-off-by: Paul Mundt