From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 25 May 2000 23:42:22 +0000 (+0000)
Subject: ChangeLog, getsize.c:
X-Git-Tag: E2FSPROGS-1_19~38
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=7fd86d396745cf38ed5a3b91d1570440a8e770a1;p=tools%2Fe2fsprogs.git

ChangeLog, getsize.c:
  getsize.c: Under linux, manually define the ioctl for BLKGETSIZE if it
  	isn't already defined and it's safe to do so.
.cvsignore:
  Ignore build files when builddir==srcdir
---

diff --git a/e2fsck/.cvsignore b/e2fsck/.cvsignore
new file mode 100644
index 0000000..4c1b76d
--- /dev/null
+++ b/e2fsck/.cvsignore
@@ -0,0 +1,6 @@
+Makefile
+e2fsck
+e2fsck.8
+e2fsck.shared
+e2fsck.static
+profiled
diff --git a/include/asm/.cvsignore b/include/asm/.cvsignore
new file mode 100644
index 0000000..8cb8a05
--- /dev/null
+++ b/include/asm/.cvsignore
@@ -0,0 +1 @@
+types.h
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index bfd3bf1..2107c19 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,7 +1,9 @@
 2000-05-25    <tytso@snap.thunk.org>
 
 	* getsize.c (ext2fs_get_device_size): Use open64() instead of
-		open() if it exists.
+		open() if it exists.  Under linux, manually define the
+		ioctl for BLKGETSIZE if it isn't already defined and it's
+		safe to do so.
 
 	* unix_io.c (unix_open): Use open64() instead of open() if it
 		exists. 
diff --git a/lib/ext2fs/getsize.c b/lib/ext2fs/getsize.c
index 7f805b4..5b2237e 100644
--- a/lib/ext2fs/getsize.c
+++ b/lib/ext2fs/getsize.c
@@ -29,6 +29,10 @@
 #include <sys/disklabel.h>
 #endif /* HAVE_SYS_DISKLABEL_H */
 
+#if defined(__linux__) && defined(_IO) && !defined(BLKGETSIZE)
+#define BLKGETSIZE _IO(0x12,96)	/* return device size */
+#endif
+
 #if EXT2_FLAT_INCLUDES
 #include "ext2_fs.h"
 #else