From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 23 Jun 2001 01:20:47 +0000 (-0400)
Subject: mkjournal.c (ext2fs_add_journal_inode): Only use fchflags if
X-Git-Tag: E2FSPROGS-1_22~6
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=7833262585b0f9f85915c387fa35708cf3ff3609;p=tools%2Fe2fsprogs.git

mkjournal.c (ext2fs_add_journal_inode): Only use fchflags if
	HAVE_CHFLAGS and UF_NODUMP are defined, since the Hurd has
	fchflags without defining UF_NODUMP.  (Addresses Debian
	bug #101361)
---

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 00ee60c..959a4be 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,5 +1,10 @@
 2001-06-22  Theodore Tso  <tytso@valinux.com>
 
+	* mkjournal.c (ext2fs_add_journal_inode): Only use fchflags if
+		HAVE_CHFLAGS and UF_NODUMP are defined, since the Hurd has
+		fchflags without defining UF_NODUMP.  (Addresses Debian
+		bug #101361)
+
 	* flushb.c: Use platform independent method of defining the
 		BLKFLSBUF and FDFLUSH ioctl's.  Also include sys/mount.h
 		since on newer glibc's BLKFLSBUF is defined there.
diff --git a/lib/ext2fs/mkjournal.c b/lib/ext2fs/mkjournal.c
index 092e4a2..adf6ea5 100644
--- a/lib/ext2fs/mkjournal.c
+++ b/lib/ext2fs/mkjournal.c
@@ -330,7 +330,7 @@ errcode_t ext2fs_add_journal_inode(ext2_filsys fs, blk_t size, int flags)
 		if (fstat(fd, &st) < 0)
 			return errno;
 
-#if HAVE_CHFLAGS
+#if defined(HAVE_CHFLAGS) && defined(UF_NODUMP)
 		retval = fchflags (fd, UF_NODUMP|UF_IMMUTABLE);
 #else
 #if HAVE_EXT2_IOCTLS