The patch titled reiser4: spin/rwlock init cleanups has been removed from the -mm tree. Its filename is reiser4-spin-rwlock-init-cleanups.patch This patch was probably dropped from -mm because it has now been merged into a subsystem tree or into Linus's tree, or because it was folded into its parent patch in the -mm tree. ------------------------------------------------------ Subject: reiser4: spin/rwlock init cleanups From: Ingo Molnar <mingo@xxxxxxx> locking init cleanups: - convert " = SPIN_LOCK_UNLOCKED" to spin_lock_init() or DEFINE_SPINLOCK() - convert rwlocks in a similar manner this patch was generated automatically. Signed-off-by: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx> Cc: "Vladimir V. Saveliev" <vs@xxxxxxxxxxx> Cc: Hans Reiser <reiser@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/reiser4/block_alloc.c | 2 +- fs/reiser4/debug.c | 2 +- fs/reiser4/fsdata.c | 2 +- fs/reiser4/txnmgr.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff -puN fs/reiser4/block_alloc.c~reiser4-spin-rwlock-init-cleanups fs/reiser4/block_alloc.c --- 25/fs/reiser4/block_alloc.c~reiser4-spin-rwlock-init-cleanups Wed May 24 12:48:55 2006 +++ 25-akpm/fs/reiser4/block_alloc.c Wed May 24 12:48:55 2006 @@ -499,7 +499,7 @@ void cluster_reserved2free(int count) spin_unlock_reiser4_super(sbinfo); } -static spinlock_t fake_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(fake_lock); static reiser4_block_nr fake_gen = 0; /* obtain a block number for new formatted node which will be used to refer diff -puN fs/reiser4/debug.c~reiser4-spin-rwlock-init-cleanups fs/reiser4/debug.c --- 25/fs/reiser4/debug.c~reiser4-spin-rwlock-init-cleanups Wed May 24 12:48:55 2006 +++ 25-akpm/fs/reiser4/debug.c Wed May 24 12:48:55 2006 @@ -52,7 +52,7 @@ static char panic_buf[REISER4_PANIC_MSG_ /* * lock protecting consistency of panic_buf under concurrent panics */ -static spinlock_t panic_guard = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(panic_guard); /* Your best friend. Call it on each occasion. This is called by fs/reiser4/debug.h:reiser4_panic(). */ diff -puN fs/reiser4/fsdata.c~reiser4-spin-rwlock-init-cleanups fs/reiser4/fsdata.c --- 25/fs/reiser4/fsdata.c~reiser4-spin-rwlock-init-cleanups Wed May 24 12:48:55 2006 +++ 25-akpm/fs/reiser4/fsdata.c Wed May 24 12:48:55 2006 @@ -16,7 +16,7 @@ static LIST_HEAD(cursor_cache); static unsigned long d_cursor_unused = 0; /* spinlock protecting manipulations with dir_cursor's hash table and lists */ -spinlock_t d_lock = SPIN_LOCK_UNLOCKED; +DEFINE_SPINLOCK(d_lock); static reiser4_file_fsdata *create_fsdata(struct file *file); static int file_is_stateless(struct file *file); diff -puN fs/reiser4/txnmgr.c~reiser4-spin-rwlock-init-cleanups fs/reiser4/txnmgr.c --- 25/fs/reiser4/txnmgr.c~reiser4-spin-rwlock-init-cleanups Wed May 24 12:48:55 2006 +++ 25-akpm/fs/reiser4/txnmgr.c Wed May 24 12:48:55 2006 @@ -905,7 +905,7 @@ jnode *find_first_dirty_jnode(txn_atom * /* this spin lock is used to prevent races during steal on capture. FIXME: should be per filesystem or even per atom */ -spinlock_t scan_lock = SPIN_LOCK_UNLOCKED; +DEFINE_SPINLOCK(scan_lock); /* Scan atom->writeback_nodes list and dispatch jnodes according to their state: * move dirty and !writeback jnodes to @fq, clean jnodes to atom's clean _ Patches currently in -mm which might be from mingo@xxxxxxx are git-acpi.patch fix-drivers-mfd-ucb1x00-corec-irq-probing-bug.patch git-infiniband.patch git-netdev-all.patch fix-for-serial-uart-lockup.patch swapless-pm-add-r-w-migration-entries-fix.patch i386-break-out-of-recursion-in-stackframe-walk.patch x86-re-enable-generic-numa.patch vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma.patch vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy.patch vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-arch_vma_name-fix.patch work-around-ppc64-bootup-bug-by-making-mutex-debugging-save-restore-irqs.patch kernel-kernel-cpuc-to-mutexes.patch cond-resched-might-sleep-fix.patch define-__raw_get_cpu_var-and-use-it.patch ide-cd-end-of-media-error-fix.patch spin-rwlock-init-cleanups.patch time-clocksource-infrastructure.patch sched-comment-bitmap-size-accounting.patch sched-fix-interactive-ceiling-code.patch sched-implement-smpnice.patch sched-protect-calculation-of-max_pull-from-integer-wrap.patch sched-store-weighted-load-on-up.patch sched-add-discrete-weighted-cpu-load-function.patch sched-prevent-high-load-weight-tasks-suppressing-balancing.patch sched-improve-stability-of-smpnice-load-balancing.patch sched-improve-smpnice-load-balancing-when-load-per-task.patch smpnice-dont-consider-sched-groups-which-are-lightly-loaded-for-balancing.patch smpnice-dont-consider-sched-groups-which-are-lightly-loaded-for-balancing-fix.patch sched-modify-move_tasks-to-improve-load-balancing-outcomes.patch sched-avoid-unnecessarily-moving-highest-priority-task-move_tasks.patch sched-avoid-unnecessarily-moving-highest-priority-task-move_tasks-fix-2.patch sched_domain-handle-kmalloc-failure.patch sched_domain-handle-kmalloc-failure-fix.patch sched_domain-dont-use-gfp_atomic.patch sched_domain-use-kmalloc_node.patch sched_domain-allocate-sched_group-structures-dynamically.patch sched-add-above-background-load-function.patch mm-implement-swap-prefetching-fix.patch pi-futex-futex-code-cleanups.patch pi-futex-robust-futex-docs-fix.patch pi-futex-introduce-debug_check_no_locks_freed.patch pi-futex-introduce-warn_on_smp.patch pi-futex-add-plist-implementation.patch pi-futex-scheduler-support-for-pi.patch pi-futex-rt-mutex-core.patch pi-futex-rt-mutex-docs.patch pi-futex-rt-mutex-docs-update.patch pi-futex-rt-mutex-debug.patch pi-futex-rt-mutex-tester.patch pi-futex-rt-mutex-futex-api.patch pi-futex-futex_lock_pi-futex_unlock_pi-support.patch futex_requeue-optimization.patch genirq-rename-desc-handler-to-desc-chip.patch genirq-rename-desc-handler-to-desc-chip-power-fix.patch genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.patch genirq-sem2mutex-probe_sem-probing_active.patch genirq-cleanup-merge-irq_affinity-into-irq_desc.patch genirq-cleanup-remove-irq_descp.patch genirq-cleanup-remove-fastcall.patch genirq-cleanup-misc-code-cleanups.patch genirq-cleanup-reduce-irq_desc_t-use-mark-it-obsolete.patch genirq-cleanup-include-linux-irqh.patch genirq-cleanup-merge-irq_dir-smp_affinity_entry-into-irq_desc.patch genirq-cleanup-merge-pending_irq_cpumask-into-irq_desc.patch genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu.patch genirq-debug-better-debug-printout-in-enable_irq.patch genirq-add-retrigger-irq-op-to-consolidate-hw_irq_resend.patch genirq-doc-comment-include-linux-irqh-structures.patch genirq-doc-handle_irq_event-and-__do_irq-comments.patch genirq-cleanup-no_irq_type-cleanups.patch genirq-doc-add-design-documentation.patch genirq-add-genirq-sw-irq-retrigger.patch genirq-add-irq_noprobe-support.patch genirq-add-irq_norequest-support.patch genirq-add-irq_noautoen-support.patch genirq-update-copyrights.patch genirq-core.patch genirq-add-irq-chip-support.patch genirq-add-handle_bad_irq.patch genirq-add-irq-wake-power-management-support.patch genirq-add-sa_trigger-support.patch genirq-cleanup-no_irq_type-no_irq_chip-rename.patch genirq-convert-the-x86_64-architecture-to-irq-chips.patch genirq-convert-the-i386-architecture-to-irq-chips.patch genirq-convert-the-i386-architecture-to-irq-chips-fix-2.patch genirq-more-verbose-debugging-on-unexpected-irq-vectors.patch detect-atomic-counter-underflows.patch debug-shared-irqs.patch make-frame_pointer-default=y.patch mutex-subsystem-synchro-test-module.patch vdso-print-fatal-signals.patch vdso-improve-print_fatal_signals-support-by-adding-memory-maps.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html