28 Jun, 2006
13 commits
-
Based on a patch series originally from Vivek Goyal
Cc: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
Based on a patch series originally from Vivek Goyal
Cc: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
But do not change it from what it currently is (unsigned long)
Based on a patch series originally from Vivek Goyal
Cc: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal
Cc: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal and
Andrew Morton.(tweaked by Andy Isaacson )
Cc: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Andy Isaacson
Signed-off-by: Greg Kroah-Hartman -
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal
Cc: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal
Cc: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal
Cc: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal
Cc: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal
Cc: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal
Cc: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal
Cc: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
Based on an original patch from Ralf Baechle and
Vivek Goyal . This is needed in order to prepare for
changing the size of resources.Cc: Ralf Baechle
Cc: Vivek Goyal
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman
27 Jun, 2006
27 commits
-
This reverts commit e5c44fd88c146755da6941d047de4d97651404a9.
Thanks to Daniel Ritz and Michal Piotrowski for noticing the problem.
Daniel says:
"[The] reason is a recent change that made modules always shows as
module.mod. it breaks modprobe and probably many scripts..besides
lsmod looking horriblestuff like this in modprobe.conf:
install pcmcia_core /sbin/modprobe --ignore-install pcmcia_core; /sbin/modprobe pcmcia
makes modprobe fork/exec endlessly calling itself...until oom
interrupts it"Signed-off-by: Linus Torvalds
-
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (56 commits)
[PATCH] fs/ocfs2/dlm/: cleanups
ocfs2: fix compiler warnings in dlm_convert_lock_handler()
ocfs2: dlm_print_one_mle() needs to be defined
ocfs2: remove whitespace in dlmunlock.c
ocfs2: move dlm work to a private work queue
ocfs2: fix incorrect error returns
ocfs2: tune down some noisy messages during dlm recovery
ocfs2: display message before waiting for recovery to complete
ocfs2: mlog in dlm_convert_lock_handler() should be ML_ERROR
ocfs2: retry operations when a lock is marked in recovery
ocfs2: use cond_resched() in dlm_thread()
ocfs2: use GFP_NOFS in some dlm operations
ocfs2: wait for recovery when starting lock mastery
ocfs2: continue recovery when a dead node is encountered
ocfs2: remove unneccesary spin_unlock() in dlm_remaster_locks()
ocfs2: dlm_remaster_locks() should never exit without completing
ocfs2: special case recovery lock in dlmlock_remote()
ocfs2: pending mastery asserts and migrations should block each other
ocfs2: temporarily disable automatic lock migration
ocfs2: do not unconditionally purge the lockres in dlmlock_remote()
... -
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3657/1: S3C24XX: Documentation update of Overview.txt
[ARM] Update mach-types
[ARM] 3656/1: S3C2412: Add S3C2412 and S3C2413 documenation
[ARM] 3654/1: add ajeco 1arm sbc support
[ARM] fix drivers/mfd/ucb1x00-core.c IRQ probing bug
[ARM] 3651/1: S3C24XX: Make arch list more detailed
[ARM] 3650/1: S3C2412: Update s3c2410_defconfig
[ARM] 3649/1: S3C24XX: Fix capitalisation of CPU on SMDK2440
[ARM] 3612/1: make pci bus optional for ixp4xx platform
[ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ
[ARM] Remove save_lr/restore_pc macros
[ARM] Remove partial non-v6 binutils compatibility
[ARM] Remove LOADREGS macro
[ARM] Remove RETINSTR macro -
* master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] 8250_pnp: add support for other Wacom tablets -
Patch from Ben Dooks
Update the list of supported devices, and remove the
changelog. Add SMDK2413 information.--Signed-off-by: Ben Dooks Signed-off-by: Russell King
-
Usual mach-types update.
Signed-off-by: Russell King
-
This patch #if 0's the no longer used dlm_dump_lock_resources().
Since this makes dlmdebug.h empty, this patch also removes this header.
Additionally, the needlessly global dlm_is_node_recovered() is made
static.Signed-off-by: Adrian Bunk
Signed-off-by: Mark Fasheh -
We need to cast to unsigned long long.
Signed-off-by: Mark Fasheh
-
Fixes compile breakage.
Signed-off-by: Mark Fasheh
-
Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
The work that is done can block for long periods of time and so is not
appropriate for keventd.Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
Use DLM_REJECTED instead of DLM_RECOVERING.
Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
Before checking for a nonexistent lock, make sure the lockres is not marked
RECOVERING. The caller will just retry and the state should be fixed up when
recovery completes.Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
yield() does not yield. cond_resched() does.
Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
We cannot restart recovery. Once we begin to recover a node, keep the state
of the recovery intact and follow through, regardless of any other node
deaths that may occur.Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
If the previous master of the recovery lock dies, let calc_usage take it
down completely and let the caller completely redo the dlmlock() call.
Otherwise, there will never be an opportunity to re-master the lockres and
recovery wont be able to progress.Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
Use the existing structure for blocking migrations when ASTs are pending to
achieve the same result. If we can catch the assert before it goes on the
wire, just cancel it and let the migration continue.Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
Now we never change the owner of a lock resource until unmount or node
death. This will be re-enabled once some issues in the algorithm used have
been resolved.Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
In dlmlock_remote(), do not call purge_lockres until the lock resource
actually changes. otherwise, the mastery info on the lockres will go away
underneath the caller.Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh -
When mastering non-recovery lock resources, additional time was frequently
needed to allow the disk heartbeat to catch up with the network timeout. the
recovery lock resource is time critical and avoids this path.Signed-off-by: Kurt Hackel
Signed-off-by: Mark Fasheh
