search for: slot_info

...(void *arg) status = -ENOMEM; goto bail; } + restart: status = ocfs2_super_lock(osb, 1); if (status < 0) { @@ -1231,6 +1233,13 @@ restart: goto bail; } + /* save slots status so we can recover offline slots */ + if (saveslots) { + saveslots = 0; + for (i = 0; i < osb->slot_info->si_num_slots; i++) + slot_arr[i] = osb->slot_info->si_slots[i].sl_valid; + } + spin_lock(&osb->osb_lock); while (rm->rm_used) { /* It's always safe to remove entry zero, as we won't @@ -1296,11 +1305,13 @@ skip_recovery: ocfs2_super_unlock(osb, 1); - /* We...

Next 3 patches does the following 1) movies ocfs2_slot_info struct from slot_map.c to slot_map.h 2) patch to recover orphans during mount even if the journal is clean 3) patch to recovery orphans in offline slots

This patch is against ocfs2-1.4 and also applies to ocfs2-1.2. ocfs2 mainline requires only the first portion of the patch and hence will make a separate patch for that.

...char *vhost_device; }; extern int nb_nics; diff --git a/qemu-kvm.c b/qemu-kvm.c index b59e403..0bd0b50 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -136,14 +136,6 @@ static inline void clear_gsi(kvm_context_t kvm, unsigned int gsi) DPRINTF("Invalid GSI %d\n"); } -struct slot_info { - unsigned long phys_addr; - unsigned long len; - unsigned long userspace_addr; - unsigned flags; - int logging_count; -}; - struct slot_info slots[KVM_MAX_NUM_MEM_REGIONS]; static void init_slots(void) diff --git a/qemu-kvm.h b/qemu-kvm.h index 6476e6f..2b6e0b6 100644 --- a/qe...

...char *vhost_device; }; extern int nb_nics; diff --git a/qemu-kvm.c b/qemu-kvm.c index b59e403..0bd0b50 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -136,14 +136,6 @@ static inline void clear_gsi(kvm_context_t kvm, unsigned int gsi) DPRINTF("Invalid GSI %d\n"); } -struct slot_info { - unsigned long phys_addr; - unsigned long len; - unsigned long userspace_addr; - unsigned flags; - int logging_count; -}; - struct slot_info slots[KVM_MAX_NUM_MEM_REGIONS]; static void init_slots(void) diff --git a/qemu-kvm.h b/qemu-kvm.h index 6476e6f..2b6e0b6 100644 --- a/qe...

...ors; + char *vhost_device; }; extern int nb_nics; diff --git a/qemu-kvm.c b/qemu-kvm.c index 32dce4a..b057046 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -136,14 +136,6 @@ static inline void clear_gsi(kvm_context_t kvm, unsigned int gsi) DPRINTF("Invalid GSI %d\n"); } -struct slot_info { - unsigned long phys_addr; - unsigned long len; - unsigned long userspace_addr; - unsigned flags; - int logging_count; -}; - struct slot_info slots[KVM_MAX_NUM_MEM_REGIONS]; static void init_slots(void) diff --git a/qemu-kvm.h b/qemu-kvm.h index eb48ff8..6b6f177 100644 --- a/qemu-kvm.h +++ b/...

...ors; + char *vhost_device; }; extern int nb_nics; diff --git a/qemu-kvm.c b/qemu-kvm.c index 32dce4a..b057046 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -136,14 +136,6 @@ static inline void clear_gsi(kvm_context_t kvm, unsigned int gsi) DPRINTF("Invalid GSI %d\n"); } -struct slot_info { - unsigned long phys_addr; - unsigned long len; - unsigned long userspace_addr; - unsigned flags; - int logging_count; -}; - struct slot_info slots[KVM_MAX_NUM_MEM_REGIONS]; static void init_slots(void) diff --git a/qemu-kvm.h b/qemu-kvm.h index eb48ff8..6b6f177 100644 --- a/qemu-kvm.h +++ b/...

...+ int vhost_device; }; extern int nb_nics; diff --git a/qemu-kvm.c b/qemu-kvm.c index 62ca050..a547975 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -150,14 +150,6 @@ static inline void clear_gsi(kvm_context_t kvm, unsigned int gsi) DPRINTF("Invalid GSI %d\n"); } -struct slot_info { - unsigned long phys_addr; - unsigned long len; - unsigned long userspace_addr; - unsigned flags; - int logging_count; -}; - struct slot_info slots[KVM_MAX_NUM_MEM_REGIONS]; static void init_slots(void) diff --git a/qemu-kvm.h b/qemu-kvm.h index d6748c7..2ab6c33 100644 --- a/qe...

...+ int vhost_device; }; extern int nb_nics; diff --git a/qemu-kvm.c b/qemu-kvm.c index 62ca050..a547975 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -150,14 +150,6 @@ static inline void clear_gsi(kvm_context_t kvm, unsigned int gsi) DPRINTF("Invalid GSI %d\n"); } -struct slot_info { - unsigned long phys_addr; - unsigned long len; - unsigned long userspace_addr; - unsigned flags; - int logging_count; -}; - struct slot_info slots[KVM_MAX_NUM_MEM_REGIONS]; static void init_slots(void) diff --git a/qemu-kvm.h b/qemu-kvm.h index d6748c7..2ab6c33 100644 --- a/qe...

...0737e01de9c411 Heming Zhao via Ocfs2-devel 2022-04-29 1859 ocfs2_shutdown_local_alloc(osb); 0737e01de9c411 Heming Zhao via Ocfs2-devel 2022-04-29 1860 ocfs2_release_system_inodes(osb); 0737e01de9c411 Heming Zhao via Ocfs2-devel 2022-04-29 1861 /* before journal shutdown, we should release slot_info */ 0737e01de9c411 Heming Zhao via Ocfs2-devel 2022-04-29 1862 ocfs2_free_slot_info(osb); 0737e01de9c411 Heming Zhao via Ocfs2-devel 2022-04-29 1863 ocfs2_journal_shutdown(osb); 0737e01de9c411 Heming Zhao via Ocfs2-devel 2022-04-29 1864 out_super_lock: 0737e01de9c411 Heming Zhao via Ocfs2-de...

...xtern int nb_nics; diff --git a/qemu-kvm.h b/qemu-kvm.h index 6476e6f..2b6e0b6 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -1215,6 +1215,15 @@ int kvm_ioctl(KVMState *s, int type, ...); int kvm_vm_ioctl(KVMState *s, int type, ...); int kvm_check_extension(KVMState *s, unsigned int ext); +struct slot_info { + unsigned long phys_addr; + unsigned long len; + unsigned long userspace_addr; + unsigned flags; + int logging_count; +}; + +extern struct slot_info slots[KVM_MAX_NUM_MEM_REGIONS]; #endif #endif -- 1.6.2.5

...xtern int nb_nics; diff --git a/qemu-kvm.h b/qemu-kvm.h index 6476e6f..2b6e0b6 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -1215,6 +1215,15 @@ int kvm_ioctl(KVMState *s, int type, ...); int kvm_vm_ioctl(KVMState *s, int type, ...); int kvm_check_extension(KVMState *s, unsigned int ext); +struct slot_info { + unsigned long phys_addr; + unsigned long len; + unsigned long userspace_addr; + unsigned flags; + int logging_count; +}; + +extern struct slot_info slots[KVM_MAX_NUM_MEM_REGIONS]; #endif #endif -- 1.6.2.5

...ked_ioctl David Teigland (2): ocfs2: handle async EAGAIN from NOQUEUE request ocfs2: add fsdlm to stackglue Jan Kara (1): ocfs2: Improve rename locking Jeff Mahoney (1): ocfs2/cluster: Get rid of arguments to the timeout routines Joel Becker (33): ocfs2: Make ocfs2_slot_info private. ocfs2: Change the recovery map to an array of node numbers. ocfs2: slot_map I/O based on max_slots. ocfs2: De-magic the in-memory slot map. ocfs2: Define the contents of the slot_map file. ocfs2: New slot map format ocfs2: Separate out dlm lock functions...

The following patch is a backport of patch that recovers orphans from offline slots. It is being backported from mainline to 1.4 mainline patch: 0001-Patch-to-recover-orphans-in-offline-slots-during-rec.patch Thanks, --Srini

Added two debugfs entries... one to dump o2hb livenodes and the other to dump osb. $ cat /sys/kernel/debug/ocfs2/BC4F4550BEA74F92BDCC746AAD2EC0BF/fs_state Device => Id: 8,65 Uuid: BC4F4550BEA74F92BDCC746AAD2EC0BF Gen: 0xA02024F2 Label: sunil-xattr Volume => State: 1 Flags: 0x0 Sizes => Block: 4096 Cluster: 4096 Features => Compat: 0x1 Incompat: 0x350 ROcompat: 0x1

Please review the list of patches being applied to the ocfs2 1.4 tree. All patches list the mainline commit hash. Thanks Sunil