unix_io.c (unix_open): Fix 2.4 resource limit workaround so that

[tools/e2fsprogs.git] / lib / ext2fs / unlink.c

diff --git a/lib/ext2fs/unlink.c b/lib/ext2fs/unlink.c
index ead5ec3..03825c4 100644 (file)
--- a/lib/ext2fs/unlink.c
+++ b/lib/ext2fs/unlink.c
@@ -15,24 +15,19 @@
 #include <unistd.h>
 #endif
 
-#if EXT2_FLAT_INCLUDES
 #include "ext2_fs.h"
-#else
-#include <linux/ext2_fs.h>
-#endif
-
 #include "ext2fs.h"
 
 struct link_struct  {
        const char      *name;
        int             namelen;
-       ino_t           inode;
+       ext2_ino_t      inode;
        int             flags;
        int             done;
 };     
 
 #ifdef __TURBOC__
-#pragma argsused
+ #pragma argsused
 #endif
 static int unlink_proc(struct ext2_dir_entry *dirent,
                     int        offset,
@@ -56,9 +51,10 @@ static int unlink_proc(struct ext2_dir_entry *dirent,
 }
 
 #ifdef __TURBOC__
-#pragma argsused
+ #pragma argsused
 #endif
-errcode_t ext2fs_unlink(ext2_filsys fs, ino_t dir, const char *name, ino_t ino,
+errcode_t ext2fs_unlink(ext2_filsys fs, ext2_ino_t dir,
+                       const char *name, ext2_ino_t ino,
                        int flags)
 {
        errcode_t       retval;