diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2022-08-24 16:53:50 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2022-08-24 16:53:50 -0400 |
| commit | ddd35c995a3e5bb3a280b57dc6af573b0f4080e3 (patch) | |
| tree | f770fbd79a805cda85f3db7912c7fa5edc4c6ce5 | |
| parent | a83e199da0ca954f7f0d63756d6eea108caf107f (diff) | |
| parent | 5cc83a2e5d2f3ec19462529c4144a2993b0c86e4 (diff) | |
| download | e2fsprogs-ddd35c995a3e5bb3a280b57dc6af573b0f4080e3.tar.gz | |
Merge branch 'maint' into next
| -rw-r--r-- | lib/Makefile.darwin-lib | 3 | ||||
| -rw-r--r-- | lib/ext2fs/mmp.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/Makefile.darwin-lib b/lib/Makefile.darwin-lib index 95cdd4b49..95e8ee066 100644 --- a/lib/Makefile.darwin-lib +++ b/lib/Makefile.darwin-lib @@ -24,7 +24,8 @@ image: $(BSD_LIB) $(BSD_LIB): $(OBJS) $(E) " GEN_BSD_SOLIB $(BSD_LIB)" $(Q) (cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \ - -flat_namespace -undefined warning -o $(BSD_LIB) $(OBJS)) + -install_name $(BSDLIB_INSTALL_DIR)/$(BSD_LIB) \ + -undefined dynamic_lookup -o $(BSD_LIB) $(OBJS)) $(Q) $(MV) pic/$(BSD_LIB) . $(Q) $(RM) -f ../$(BSD_LIB) $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \ diff --git a/lib/ext2fs/mmp.c b/lib/ext2fs/mmp.c index 9ef458091..7970aac27 100644 --- a/lib/ext2fs/mmp.c +++ b/lib/ext2fs/mmp.c @@ -58,7 +58,7 @@ errcode_t ext2fs_mmp_read(ext2_filsys fs, blk64_t mmp_blk, void *buf) * the MMP block by the io_manager or the VM. It needs to be fresh. */ if (fs->mmp_fd <= 0) { struct stat st; - int flags = O_RDWR | O_DIRECT; + int flags = O_RDONLY | O_DIRECT; /* * There is no reason for using O_DIRECT if we're working with |