Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocfs2-tools for openSUSE:Factory checked in at 2023-09-13 20:45:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old) and /work/SRC/openSUSE:Factory/.ocfs2-tools.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocfs2-tools" Wed Sep 13 20:45:31 2023 rev:86 rq:1110810 version:1.8.8 Changes: -------- --- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes 2022-10-25 11:19:39.786090859 +0200 +++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new.1766/ocfs2-tools.changes 2023-09-13 20:47:40.268722960 +0200 @@ -1,0 +2,13 @@ +Wed Sep 06 10:50:00 UTC 2023 - heming.z...@suse.com + +- Update from 1.8.7 to 1.8.8 (PED-6362) + * Upstream only marked a new tag, there is no new feature in this upgrade. + * remove patch + - ocfs2-tools-kernel33.patch + - fixed-mounted.ocfs2-output-when-some-devices-are-Not.patch + - update-mounted.ocfs2-mounted.c.patch + - libocfs2-roll-back-when-dir_index-creation-fails.patch + - fsck.ocfs2-do-not-try-locking-after-replaying-journa.patch + - bug-1203166-dump_fs_locks-support-v4.patch + +------------------------------------------------------------------- Old: ---- bug-1203166-dump_fs_locks-support-v4.patch fixed-mounted.ocfs2-output-when-some-devices-are-Not.patch fsck.ocfs2-do-not-try-locking-after-replaying-journa.patch libocfs2-roll-back-when-dir_index-creation-fails.patch ocfs2-tools-1.8.7.tar.gz ocfs2-tools-kernel33.patch update-mounted.ocfs2-mounted.c.patch New: ---- ocfs2-tools-1.8.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocfs2-tools.spec ++++++ --- /var/tmp/diff_new_pack.9uQvRR/_old 2023-09-13 20:47:42.568805013 +0200 +++ /var/tmp/diff_new_pack.9uQvRR/_new 2023-09-13 20:47:42.568805013 +0200 @@ -43,7 +43,7 @@ %endif Name: ocfs2-tools -Version: 1.8.7 +Version: 1.8.8 Release: 0 Summary: Oracle Cluster File System 2 Core Tools License: GPL-2.0-only @@ -51,6 +51,8 @@ URL: https://ocfs2.wiki.kernel.org/ Source: ocfs2-tools-%{version}.tar.gz Source1: reflink.tar.bz2 + +# suse special patches Patch001: auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch Patch103: debug-ocfs2_hb_ctl.patch Patch105: bug-470741-debug_start_failures.patch @@ -58,18 +60,13 @@ Patch107: reflink-no-syscall.patch Patch202: fix-configure-check-libs.patch Patch204: dont-use-var-lock-subsys.patch -Patch205: ocfs2-tools-kernel33.patch -Patch206: ocfs2-tools-resource.patch +Patch205: ocfs2-tools-resource.patch Patch225: 0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch Patch228: 0007-Improve-error-message-if-DLM-service-is-unavailable.patch Patch405: 0007-vendor-Add-vendor-files-for-sles12.patch Patch406: 0008-ocfs2-tools-add-systemd-support-fix.patch -# below are upstream patches -Patch501: fixed-mounted.ocfs2-output-when-some-devices-are-Not.patch -Patch502: update-mounted.ocfs2-mounted.c.patch -Patch503: libocfs2-roll-back-when-dir_index-creation-fails.patch -Patch504: fsck.ocfs2-do-not-try-locking-after-replaying-journa.patch -Patch505: bug-1203166-dump_fs_locks-support-v4.patch +# upstream patches (start from Patch501) +# n/a. BuildRequires: autoconf BuildRequires: e2fsprogs-devel @@ -172,16 +169,10 @@ %patch202 -p1 %patch204 -p1 %patch205 -p1 -%patch206 -p1 %patch225 -p1 %patch228 -p1 %patch405 -p1 %patch406 -p1 -%patch501 -p1 -%patch502 -p1 -%patch503 -p1 -%patch504 -p1 -%patch505 -p1 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects ++++++ ocfs2-tools-1.8.7.tar.gz -> ocfs2-tools-1.8.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/.gitignore new/ocfs2-tools-1.8.8/.gitignore --- old/ocfs2-tools-1.8.7/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,15 @@ +cscope.* +*.a +*.o +stamp-md5 +configure +Config.make +config.* +autom4te.cache +aclocal.m4 +ocfs2-tools-*.src.rpm +ocfs2-tools-*.tar.gz +build-stamp +configure-stamp +*.pc +*.sw? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/configure.in new/ocfs2-tools-1.8.8/configure.in --- old/ocfs2-tools-1.8.7/configure.in 2021-05-26 09:00:45.000000000 +0200 +++ new/ocfs2-tools-1.8.8/configure.in 2023-09-06 04:51:30.000000000 +0200 @@ -9,7 +9,7 @@ # Adjust these for the software version. MAJOR_VERSION=1 MINOR_VERSION=8 -MICRO_VERSION=7 +MICRO_VERSION=8 EXTRA_VERSION= DIST_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/debian/.gitignore new/ocfs2-tools-1.8.8/debian/.gitignore --- old/ocfs2-tools-1.8.7/debian/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/debian/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,13 @@ +*.sw? +files +*.debhelper +tmp +dsh +*.substvars +ocfs2-tools.o2cb.default +ocfs2-tools.o2cb.init +ocfs2-tools.ocfs2.init +ocfs2-tools +ocfs2-tools-static-dev +stamp-patched +ocfs2console diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/debugfs.ocfs2/.gitignore new/ocfs2-tools-1.8.8/debugfs.ocfs2/.gitignore --- old/ocfs2-tools-1.8.7/debugfs.ocfs2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/debugfs.ocfs2/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,7 @@ +cscope.out +debugfs.ocfs2 +cscope.files +*.sw? +*.d +debugfs.ocfs2.8 +stamp-md5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/debugfs.ocfs2/dump_fs_locks.c new/ocfs2-tools-1.8.8/debugfs.ocfs2/dump_fs_locks.c --- old/ocfs2-tools-1.8.7/debugfs.ocfs2/dump_fs_locks.c 2021-05-26 09:00:45.000000000 +0200 +++ new/ocfs2-tools-1.8.8/debugfs.ocfs2/dump_fs_locks.c 2023-09-06 04:51:30.000000000 +0200 @@ -225,13 +225,14 @@ } /* 0 = eof, > 0 = success, < 0 = error */ -static int dump_version_two_and_three(FILE *file, FILE *out, int v3) +static int dump_version_two_or_more(FILE *file, FILE *out, int version) { unsigned long long num_prmode, num_exmode; unsigned int num_prmode_failed, num_exmode_failed; unsigned long long total_prmode, total_exmode; unsigned long long avg_prmode = 0, avg_exmode = 0; unsigned int max_prmode, max_exmode, num_refresh; + unsigned long long last_prmode, last_exmode, wait; int ret; #define NSEC_PER_USEC 1000 @@ -244,7 +245,10 @@ "%llu\t" "%u\t" "%u\t" - "%u", + "%u\t" + "%llu\t" + "%llu\t" + "%llu", &num_prmode, &num_exmode, &num_prmode_failed, @@ -253,13 +257,16 @@ &total_exmode, &max_prmode, &max_exmode, - &num_refresh); - if (ret != 9) { + &num_refresh, + &last_prmode, + &last_exmode, + &wait); + if (ret != 12) { ret = -EINVAL; goto out; } - if (!v3) { + if (version < 3) { max_prmode /= NSEC_PER_USEC; max_exmode /= NSEC_PER_USEC; } @@ -271,14 +278,26 @@ avg_exmode = total_exmode/num_exmode; fprintf(out, "PR > Gets: %llu Fails: %u Waits Total: %lluus " - "Max: %uus Avg: %lluns\n", + "Max: %uus Avg: %lluns", num_prmode, num_prmode_failed, total_prmode/NSEC_PER_USEC, max_prmode, avg_prmode); + if (version > 3) { + fprintf(out, " Last: %lluus", last_prmode); + } + fprintf(out, "\n"); fprintf(out, "EX > Gets: %llu Fails: %u Waits Total: %lluus " - "Max: %uus Avg: %lluns\n", + "Max: %uus Avg: %lluns", num_exmode, num_exmode_failed, total_exmode/NSEC_PER_USEC, max_exmode, avg_exmode); - fprintf(out, "Disk Refreshes: %u\n", num_refresh); + if (version > 3) { + fprintf(out, " Last: %lluus", last_exmode); + } + fprintf(out, "\n"); + fprintf(out, "Disk Refreshes: %u", num_refresh); + if (version > 3) { + fprintf(out, " First Wait: %lluus", wait); + } + fprintf(out, "\n"); ret = 1; out: @@ -388,13 +407,13 @@ return 0; } -#define CURRENT_PROTO 3 +#define CURRENT_PROTO 4 /* returns 0 on error or end of file */ static int dump_one_lockres(FILE *file, FILE *out, int lvbs, int only_busy, struct list_head *locklist) { unsigned int version; - int ret, v3; + int ret; int skipped = 0; ret = fscanf(file, "%x\t", &version); @@ -413,8 +432,7 @@ if (!skipped) { if (version > 1) { - v3 = !!(version == 3); - ret = dump_version_two_and_three(file, out, v3); + ret = dump_version_two_or_more(file, out, version); if (ret <= 0) return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/documentation/.gitignore new/ocfs2-tools-1.8.8/documentation/.gitignore --- old/ocfs2-tools-1.8.7/documentation/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/documentation/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1 @@ +*.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/extras/.gitignore new/ocfs2-tools-1.8.8/extras/.gitignore --- old/ocfs2-tools-1.8.7/extras/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/extras/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,13 @@ +*.sw? +find_hardlinks +find_dup_extents +find_inode_paths +set_random_bits +decode_lockres +mark_journal_dirty +encode_lockres +find_allocation_fragments +compute_groups +check_metaecc +*.d +resize_slotmap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/fsck.ocfs2/.gitignore new/ocfs2-tools-1.8.8/fsck.ocfs2/.gitignore --- old/ocfs2-tools-1.8.7/fsck.ocfs2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/fsck.ocfs2/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,8 @@ +cscope* +stamp-md5 +*.sw? +*.cmd +fsck.ocfs2 +*.8 +*.d +prompt-codes.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/fsck.ocfs2/fsck.c new/ocfs2-tools-1.8.8/fsck.ocfs2/fsck.c --- old/ocfs2-tools-1.8.7/fsck.ocfs2/fsck.c 2021-05-26 09:00:45.000000000 +0200 +++ new/ocfs2-tools-1.8.8/fsck.ocfs2/fsck.c 2023-09-06 04:51:30.000000000 +0200 @@ -707,6 +707,10 @@ { errcode_t ret; + if (!(ost->ost_fs->fs_flags & OCFS2_FLAG_RW) || ost->ost_skip_o2cb || + ocfs2_mount_local(ost->ost_fs)) + return 0; + ret = o2cb_init(); if (ret) { com_err(whoami, ret, "while initializing the cluster"); @@ -986,13 +990,10 @@ goto out; } - if (open_flags & OCFS2_FLAG_RW && !ost->ost_skip_o2cb && - !ocfs2_mount_local(ost->ost_fs)) { - ret = fsck_lock_fs(ost); - if (ret) { - fsck_mask |= FSCK_ERROR; - goto close; - } + ret = fsck_lock_fs(ost); + if (ret) { + fsck_mask |= FSCK_ERROR; + goto close; } printf("Checking OCFS2 filesystem in %s:\n", filename); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/fswreck/.gitignore new/ocfs2-tools-1.8.8/fswreck/.gitignore --- old/ocfs2-tools-1.8.7/fswreck/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/fswreck/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,4 @@ +cscope.* +fswreck +*.d +*.sw? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/include/o2cb/.gitignore new/ocfs2-tools-1.8.8/include/o2cb/.gitignore --- old/ocfs2-tools-1.8.7/include/o2cb/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/include/o2cb/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1 @@ +o2cb_err.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/include/o2dlm/.gitignore new/ocfs2-tools-1.8.8/include/o2dlm/.gitignore --- old/ocfs2-tools-1.8.7/include/o2dlm/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/include/o2dlm/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1 @@ +o2dlm_err.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/include/ocfs2/.gitignore new/ocfs2-tools-1.8.8/include/ocfs2/.gitignore --- old/ocfs2-tools-1.8.7/include/ocfs2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/include/ocfs2/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,5 @@ +cscope* +stamp-md5 +*.sw? +*.cmd +ocfs2_err.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/libo2cb/.gitignore new/ocfs2-tools-1.8.8/libo2cb/.gitignore --- old/ocfs2-tools-1.8.7/libo2cb/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/libo2cb/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,8 @@ +*.sw? +*.d +debug_* +o2cb_err.c +o2cb_err.h +cscope* +libo2cb.a +o2cb.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/libo2dlm/.gitignore new/ocfs2-tools-1.8.8/libo2dlm/.gitignore --- old/ocfs2-tools-1.8.7/libo2dlm/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/libo2dlm/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,7 @@ +cscope.* +libo2dlm.a +o2dlm_err.* +*.d +o2dlm_test +libdlm.h +debug_* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/libocfs2/.gitignore new/ocfs2-tools-1.8.8/libocfs2/.gitignore --- old/ocfs2-tools-1.8.7/libocfs2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/libocfs2/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,10 @@ +cscope* +stamp-md5 +*.sw? +*.cmd +ocfs2_err.c +ocfs2_err.h +libocfs2.a +debug_* +*.d +ocfs2.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/libocfs2/dir_indexed.c new/ocfs2-tools-1.8.8/libocfs2/dir_indexed.c --- old/ocfs2-tools-1.8.7/libocfs2/dir_indexed.c 2021-05-26 09:00:45.000000000 +0200 +++ new/ocfs2-tools-1.8.8/libocfs2/dir_indexed.c 2023-09-06 04:51:30.000000000 +0200 @@ -1239,20 +1239,26 @@ goto out; ret = ocfs2_malloc_block(fs->fs_io, &dx_buf); - if (ret) + if (ret) { + ocfs2_delete_dx_root(fs, dr_blkno); goto out; + } ret = ocfs2_read_dx_root(fs, dr_blkno, dx_buf); - if (ret) + if (ret) { + ocfs2_delete_dx_root(fs, dr_blkno); goto out; + } dx_root = (struct ocfs2_dx_root_block *)dx_buf; /* set inode to use indexed-dirs */ di->i_dyn_features |= OCFS2_INDEXED_DIR_FL; ret = ocfs2_init_dir_trailers(fs, di, dx_root); - if (ret) + if (ret) { + ocfs2_delete_dx_root(fs, dr_blkno); goto out; + } dx_root->dr_dir_blkno = di->i_blkno; dx_root->dr_num_entries = 0; @@ -1261,11 +1267,15 @@ di->i_dx_root = dr_blkno; ret = ocfs2_write_dx_root(fs, dr_blkno, dx_buf); - if (ret) + if (ret) { + ocfs2_delete_dx_root(fs, dr_blkno); goto out; + } ret = ocfs2_write_inode(fs, dir, di_buf); - if (ret) + if (ret) { + ocfs2_delete_dx_root(fs, dr_blkno); goto out; + } ctxt.dir_blkno = dir; ctxt.dx_root_blkno = dr_blkno; @@ -1276,18 +1286,18 @@ if (ctxt.err) ret = ctxt.err; if (ret) - goto out; + goto trunc_out; ret = ocfs2_read_dx_root(fs, dr_blkno, dx_buf); if (ret) - goto out; + goto trunc_out; ret = ocfs2_read_inode(fs, dir, di_buf); if (ret) - goto out; + goto trunc_out; ret = ocfs2_write_inode(fs, dir, di_buf); - if(ret) - goto out; + if (ret) + goto trunc_out; /* check quota for dx_leaf */ change = ocfs2_clusters_to_bytes(fs, @@ -1297,10 +1307,12 @@ ret = ocfs2_apply_quota_change(fs, usrhash, grphash, uid, gid, change, 0); - if (ret) { - /* exceed quota, truncate the indexed tree */ - ret = ocfs2_dx_dir_truncate(fs, dir); - } + +trunc_out: + /* if the indexed dir attribute creation fails, + * we must roll back */ + if (ret) + ocfs2_dx_dir_truncate(fs, dir); out: err = ocfs2_finish_quota_change(fs, usrhash, grphash); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/libtools-internal/.gitignore new/ocfs2-tools-1.8.8/libtools-internal/.gitignore --- old/ocfs2-tools-1.8.7/libtools-internal/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/libtools-internal/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,4 @@ +cscope.* +libtools-internal.a +*.d +debug_* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/listuuid/.gitignore new/ocfs2-tools-1.8.8/listuuid/.gitignore --- old/ocfs2-tools-1.8.7/listuuid/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/listuuid/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,3 @@ +*.sw? +listuuid +*.d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/mkfs.ocfs2/.gitignore new/ocfs2-tools-1.8.8/mkfs.ocfs2/.gitignore --- old/ocfs2-tools-1.8.7/mkfs.ocfs2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/mkfs.ocfs2/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,7 @@ +*.sw? +stamp-md5 +mkfs.ocfs2 +cscope* +mkfs.ocfs2.8 +tunefs.ocfs2 +*.d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/mount.ocfs2/.gitignore new/ocfs2-tools-1.8.8/mount.ocfs2/.gitignore --- old/ocfs2-tools-1.8.7/mount.ocfs2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/mount.ocfs2/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,5 @@ +*.sw? +mount.ocfs2 +mount.ocfs2.8 +*.d +cscope.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/mounted.ocfs2/.gitignore new/ocfs2-tools-1.8.8/mounted.ocfs2/.gitignore --- old/ocfs2-tools-1.8.7/mounted.ocfs2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/mounted.ocfs2/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,6 @@ +mounted.ocfs2 +stamp-md5 +*.sw? +cscope.* +*.d +mounted.ocfs2.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/mounted.ocfs2/mounted.c new/ocfs2-tools-1.8.8/mounted.ocfs2/mounted.c --- old/ocfs2-tools-1.8.7/mounted.ocfs2/mounted.c 2021-05-26 09:00:45.000000000 +0200 +++ new/ocfs2-tools-1.8.8/mounted.ocfs2/mounted.c 2023-09-06 04:51:30.000000000 +0200 @@ -530,7 +530,7 @@ for (offset = 1; offset <= 8; offset <<= 1) { ret = do_pread(fd, buf, sizeof(buf), (offset * 1024)); - if (ret < sizeof(buf)) + if (ret == -1 || ret != sizeof(buf)) break; di = (struct ocfs2_dinode *)buf; if (!memcmp(di->i_signature, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/o2cb_ctl/.gitignore new/ocfs2-tools-1.8.8/o2cb_ctl/.gitignore --- old/ocfs2-tools-1.8.7/o2cb_ctl/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/o2cb_ctl/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,9 @@ +*.sw? +*.d +clusterbo +o2cb_ctl +o2cb_ctl.8 +cscope.* +o2cb +o2cb.8 +ocfs2.cluster.conf.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/o2image/.gitignore new/ocfs2-tools-1.8.8/o2image/.gitignore --- old/ocfs2-tools-1.8.7/o2image/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/o2image/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,4 @@ +*.sw? +*.d +o2image +o2image.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/o2info/.gitignore new/ocfs2-tools-1.8.8/o2info/.gitignore --- old/ocfs2-tools-1.8.7/o2info/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/o2info/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,7 @@ +*.sw? +*.d +*.cmd +stamp-md5 +cscope* +o2info +o2info.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/o2monitor/.gitignore new/ocfs2-tools-1.8.8/o2monitor/.gitignore --- old/ocfs2-tools-1.8.7/o2monitor/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/o2monitor/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,4 @@ +*.sw? +*.d +o2hbmonitor +o2hbmonitor.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/ocfs2_controld/.gitignore new/ocfs2-tools-1.8.8/ocfs2_controld/.gitignore --- old/ocfs2-tools-1.8.7/ocfs2_controld/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/ocfs2_controld/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,5 @@ +*.sw? +*.d +test_client +ocfs2_controld.cman +ocfs2_controld.pcmk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/ocfs2_hb_ctl/.gitignore new/ocfs2-tools-1.8.8/ocfs2_hb_ctl/.gitignore --- old/ocfs2-tools-1.8.7/ocfs2_hb_ctl/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/ocfs2_hb_ctl/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,5 @@ +*.sw? +ocfs2_hb_ctl +ocfs2_hb_ctl.8 +*.d +cscope.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/ocfs2cdsl/.gitignore new/ocfs2-tools-1.8.8/ocfs2cdsl/.gitignore --- old/ocfs2-tools-1.8.7/ocfs2cdsl/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/ocfs2cdsl/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,5 @@ +*.sw? +ocfs2cdsl +stamp-md5 +*.d +ocfs2cdsl.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/ocfs2console/.gitignore new/ocfs2-tools-1.8.8/ocfs2console/.gitignore --- old/ocfs2-tools-1.8.7/ocfs2console/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/ocfs2console/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,9 @@ +*.sw? +*.pyc +ocfsmarshal.c +ocfsmarshal.h +cellmap.c +*.so +ocfs2tool.8 +*.d +ocfs2console.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/ocfs2console/blkid/.gitignore new/ocfs2-tools-1.8.8/ocfs2console/blkid/.gitignore --- old/ocfs2-tools-1.8.7/ocfs2console/blkid/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/ocfs2console/blkid/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,4 @@ +*.sw? +*.d +blkid_types.h +libblkid-internal.a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/ocfs2console/ocfs2interface/.gitignore new/ocfs2-tools-1.8.8/ocfs2console/ocfs2interface/.gitignore --- old/ocfs2-tools-1.8.7/ocfs2console/ocfs2interface/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/ocfs2console/ocfs2interface/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,8 @@ +*.d +*.pyc +*.pyo +plistmodule.so +gidlemodule.so +ocfs2module.so +o2cbmodule.so +confdefs.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/sizetest/.gitignore new/ocfs2-tools-1.8.8/sizetest/.gitignore --- old/ocfs2-tools-1.8.7/sizetest/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/sizetest/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,7 @@ +cscope* +stamp-md5 +*.sw? +*.cmd +sizetest.ocfs2 +*.8 +*.d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/tunefs.ocfs2/.gitignore new/ocfs2-tools-1.8.8/tunefs.ocfs2/.gitignore --- old/ocfs2-tools-1.8.7/tunefs.ocfs2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/tunefs.ocfs2/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,11 @@ +cscope* +tunefs.ocfs2 +*.sw? +stamp-md5 +*.d +tunefs.ocfs2.8 +o2ne_err.[ch] +debug_* +ocfs2ne +o2cluster +o2cluster.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocfs2-tools-1.8.7/vendor/common/.gitignore new/ocfs2-tools-1.8.8/vendor/common/.gitignore --- old/ocfs2-tools-1.8.7/vendor/common/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocfs2-tools-1.8.8/vendor/common/.gitignore 2023-09-06 04:51:30.000000000 +0200 @@ -0,0 +1,5 @@ +ocfs2-tools.spec +ocfs2-tools.spec-generic +*.sw? +o2cb.init +o2cb.sysconfig.5
