From 353f96218fd7c851dfbe613d8dc33948ea7d38c1 Mon Sep 17 00:00:00 2001 From: Li Dongyang Date: Mon, 23 Mar 2020 12:56:00 +1100 Subject: [PATCH] LU-13241 libext2fs: add quota to libext2fs add quota related interface to libext2fs and install the relevant headers. Change-Id: I17e6b5aa74e0f1bb1465168a1cf4e03184e003b0 Signed-off-by: Li Dongyang Reviewed-on: https://review.whamcloud.com/38027 Reviewed-by: Andreas Dilger Tested-by: jenkins Tested-by: Maloo --- lib/ext2fs/Makefile.in | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index 774065f..08e3cd7 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -27,6 +27,8 @@ DEBUG_OBJS= debug_cmds.o extent_cmds.o tst_cmds.o debugfs.o util.o \ xattrs.o quota.o tst_libext2fs.o create_inode.o journal.o \ revoke.o recovery.o do_journal.o +QUOTA_LIB_OBJS= mkquota.o quotaio.o quotaio_v2.o quotaio_tree.o dict.o + DEBUG_SRCS= debug_cmds.c extent_cmds.c tst_cmds.c \ $(top_srcdir)/debugfs/debugfs.c \ $(top_srcdir)/debugfs/util.c \ @@ -54,6 +56,7 @@ DEBUG_SRCS= debug_cmds.c extent_cmds.c tst_cmds.c \ @TDB_CMT@TDB_OBJ= tdb.o OBJS= $(DEBUGFS_LIB_OBJS) $(RESIZE_LIB_OBJS) $(E2IMAGE_LIB_OBJS) \ + $(QUOTA_LIB_OBJS) \ $(TEST_IO_LIB_OBJS) \ ext2_err.o \ alloc.o \ @@ -229,6 +232,7 @@ SRCS= ext2_err.c \ HFILES= bitops.h ext2fs.h ext2_io.h ext2_fs.h ext2_ext_attr.h ext3_extents.h \ tdb.h qcow2.h hashmap.h +QUOTA_HFILES= quotaio.h dqblk_v2.h quotaio_tree.h HFILES_IN= ext2_err.h ext2_types.h ext2_types-wrapper.h LIBRARY= libext2fs @@ -448,6 +452,41 @@ do_journal.o: $(top_srcdir)/debugfs/do_journal.c $(E) " CC $<" $(Q) $(CC) $(DEBUGFS_CFLAGS) -c $< -o $@ +mkquota.o: $(top_srcdir)/lib/support/mkquota.c + $(E) " CC $<" + $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_STLIB) -c $< -o $@ +@PROFILE_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_STLIB) -g -pg -o profiled/$*.o -c $< +@ELF_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_SHLIB) -fPIC -shared -o elfshared/$*.o -c $< +@BSDLIB_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_SHLIB) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + +quotaio.o: $(top_srcdir)/lib/support/quotaio.c + $(E) " CC $<" + $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_STLIB) -c $< -o $@ +@PROFILE_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_STLIB) -g -pg -o profiled/$*.o -c $< +@ELF_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_SHLIB) -fPIC -shared -o elfshared/$*.o -c $< +@BSDLIB_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_SHLIB) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + +quotaio_v2.o: $(top_srcdir)/lib/support/quotaio_v2.c + $(E) " CC $<" + $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_STLIB) -c $< -o $@ +@PROFILE_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_STLIB) -g -pg -o profiled/$*.o -c $< +@ELF_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_SHLIB) -fPIC -shared -o elfshared/$*.o -c $< +@BSDLIB_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_SHLIB) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + +quotaio_tree.o: $(top_srcdir)/lib/support/quotaio_tree.c + $(E) " CC $<" + $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_STLIB) -c $< -o $@ +@PROFILE_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_STLIB) -g -pg -o profiled/$*.o -c $< +@ELF_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_SHLIB) -fPIC -shared -o elfshared/$*.o -c $< +@BSDLIB_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_SHLIB) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + +dict.o: $(top_srcdir)/lib/support/dict.c + $(E) " CC $<" + $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_STLIB) -c $< -o $@ +@PROFILE_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_STLIB) -g -pg -o profiled/$*.o -c $< +@ELF_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_SHLIB) -fPIC -shared -o elfshared/$*.o -c $< +@BSDLIB_CMT@ $(Q) $(CC) -I$(top_srcdir)/lib/support $(ALL_CFLAGS_SHLIB) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + xattrs.o: $(top_srcdir)/debugfs/xattrs.c $(E) " CC $<" $(Q) $(CC) $(DEBUGFS_CFLAGS) -c $< -o $@ @@ -569,6 +608,10 @@ install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc echo " INSTALL_DATA $(includedir)/ext2fs/$$i"; \ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ext2fs/$$i; \ done + $(Q) for i in $(QUOTA_HFILES); do \ + echo " INSTALL_DATA $(includedir)/ext2fs/$$i"; \ + $(INSTALL_DATA) $(top_srcdir)/lib/support/$$i $(DESTDIR)$(includedir)/ext2fs/$$i; \ + done $(Q) for i in $(HFILES_IN); do \ echo " INSTALL_DATA $(includedir)/ext2fs/$$i"; \ $(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/ext2fs/$$i; \ -- 1.8.3.1