Merge branch 'gluster:devel' into misuse_of_ctype_h_4397

ThalesBarretto · web-flow · commit 466a1ad752ed · 2025-08-04T15:57:38.000-03:00
diff --git a/api/examples/Makefile.am b/api/examples/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 # The bits needed for glfsxmp
 EXTRA_PROGRAMS = glfsxmp
 glfsxmp_SOURCES = glfsxmp.c
diff --git a/contrib/fuse-util/Makefile.am b/contrib/fuse-util/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 bin_PROGRAMS = fusermount-glusterfs
 
 fusermount_glusterfs_SOURCES = fusermount.c mount_util.c $(CONTRIBDIR)/fuse-lib/mount-common.c
diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 noinst_PYTHON = generator.py gen-defaults.py $(top_srcdir)/events/eventskeygen.py
 
 libglusterfs_la_CFLAGS = $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) \
diff --git a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 xlator_LTLIBRARIES = afr.la
 xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
 
diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 xlator_LTLIBRARIES = dht.la nufa.la switch.la
 
 AM_CFLAGS = -Wall $(GF_CFLAGS)
diff --git a/xlators/cluster/ec/src/Makefile.am b/xlators/cluster/ec/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 xlator_LTLIBRARIES = ec.la
 xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
 
diff --git a/xlators/cluster/ec/src/ec.c b/xlators/cluster/ec/src/ec.c
@@ -1288,7 +1288,6 @@ ec_handle_readmask(call_frame_t *frame, xlator_t *this, loc_t *loc,
                    dict_t *dict, int32_t flags, dict_t *xdata)
 {
     ec_t *ec = this->private;
-    data_t *dict_data = NULL;
     char *read_mask_str = NULL;
     int32_t op_ret = -1;
     int32_t op_errno = EINVAL;
diff --git a/xlators/features/changelog/lib/src/Makefile.am b/xlators/features/changelog/lib/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 libgfchangelog_la_CFLAGS = -Wall $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) \
 	-DDATADIR=\"$(localstatedir)\"
 
diff --git a/xlators/features/changelog/src/Makefile.am b/xlators/features/changelog/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 xlator_LTLIBRARIES = changelog.la
 
 xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
diff --git a/xlators/features/cloudsync/src/Makefile.am b/xlators/features/cloudsync/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 SUBDIRS = cloudsync-plugins
 
 xlator_LTLIBRARIES = cloudsync.la
diff --git a/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/Makefile.am b/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 csp_LTLIBRARIES = cloudsyncs3.la
 cspdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/cloudsync-plugins
 
diff --git a/xlators/features/cloudsync/src/cloudsync-plugins/src/cvlt/src/Makefile.am b/xlators/features/cloudsync/src/cloudsync-plugins/src/cvlt/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 csp_LTLIBRARIES = cloudsynccvlt.la
 cspdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/cloudsync-plugins
 
diff --git a/xlators/features/thin-arbiter/src/Makefile.am b/xlators/features/thin-arbiter/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 xlator_LTLIBRARIES = thin-arbiter.la
 
 xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
diff --git a/xlators/features/utime/src/Makefile.am b/xlators/features/utime/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 xlator_LTLIBRARIES = utime.la
 xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
 
diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 if WITH_SERVER
 xlator_LTLIBRARIES = glusterd.la
 endif
diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 noinst_HEADERS_linux = $(CONTRIBDIR)/fuse-include/fuse_kernel.h\
 	$(CONTRIBDIR)/fuse-include/mount_util.h\
 	$(CONTRIBDIR)/fuse-lib/mount-gluster-compat.h

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+AUTOMAKE_OPTIONS = subdir-objects`
	`2`	`+`
`1`	`3`	`# The bits needed for glfsxmp`
`2`	`4`	`EXTRA_PROGRAMS = glfsxmp`
`3`	`5`	`glfsxmp_SOURCES = glfsxmp.c`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+AUTOMAKE_OPTIONS = subdir-objects`
	`2`	`+`
`1`	`3`	`bin_PROGRAMS = fusermount-glusterfs`
`2`	`4`
`3`	`5`	`fusermount_glusterfs_SOURCES = fusermount.c mount_util.c $(CONTRIBDIR)/fuse-lib/mount-common.c`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+AUTOMAKE_OPTIONS = subdir-objects`
	`2`	`+`
`1`	`3`	`noinst_PYTHON = generator.py gen-defaults.py $(top_srcdir)/events/eventskeygen.py`
`2`	`4`
`3`	`5`	`libglusterfs_la_CFLAGS = $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) \`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+AUTOMAKE_OPTIONS = subdir-objects`
	`2`	`+`
`1`	`3`	`xlator_LTLIBRARIES = afr.la`
`2`	`4`	`xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+AUTOMAKE_OPTIONS = subdir-objects`
	`2`	`+`
`1`	`3`	`xlator_LTLIBRARIES = dht.la nufa.la switch.la`
`2`	`4`
`3`	`5`	`AM_CFLAGS = -Wall $(GF_CFLAGS)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+AUTOMAKE_OPTIONS = subdir-objects`
	`2`	`+`
`1`	`3`	`xlator_LTLIBRARIES = ec.la`
`2`	`4`	`xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1288,7 +1288,6 @@ ec_handle_readmask(call_frame_t frame, xlator_t this, loc_t *loc,`
`1288`	`1288`	`dict_t dict, int32_t flags, dict_t xdata)`
`1289`	`1289`	`{`
`1290`	`1290`	`ec_t *ec = this->private;`
`1291`		`- data_t *dict_data = NULL;`
`1292`	`1291`	`char *read_mask_str = NULL;`
`1293`	`1292`	`int32_t op_ret = -1;`
`1294`	`1293`	`int32_t op_errno = EINVAL;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+AUTOMAKE_OPTIONS = subdir-objects`
	`2`	`+`
`1`	`3`	`libgfchangelog_la_CFLAGS = -Wall $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) \`
`2`	`4`	`-DDATADIR=\"$(localstatedir)\"`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+AUTOMAKE_OPTIONS = subdir-objects`
	`2`	`+`
`1`	`3`	`xlator_LTLIBRARIES = changelog.la`
`2`	`4`
`3`	`5`	`xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+AUTOMAKE_OPTIONS = subdir-objects`
	`2`	`+`
`1`	`3`	`SUBDIRS = cloudsync-plugins`
`2`	`4`
`3`	`5`	`xlator_LTLIBRARIES = cloudsync.la`