Imported reiserfsprogs-3.6.13

include/Makefile.in

@@ -77,6 +77,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+UUID_LIBS = @UUID_LIBS@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_RANLIB = @ac_ct_RANLIB@

include/config.h.in

@@ -9,6 +9,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `uuid' library (-luuid). */
+#undef HAVE_LIBUUID
+
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
@@ -61,6 +64,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the <uuid/uuid.h> header file. */
+#undef HAVE_UUID_UUID_H
+
 /* Define to 1 if you have the `vprintf' function. */
 #undef HAVE_VPRINTF
 

include/io.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-2003 by Hans Reiser, licensing governed by 
+ * Copyright 1996-2004 by Hans Reiser, licensing governed by 
  * reiserfsprogs/README
  */
 
@@ -55,7 +55,6 @@ struct buffer_head * find_buffer (int dev, unsigned long block, unsigned long si
 struct buffer_head * get_hash_table(dev_t dev, unsigned long block, int size);
 struct buffer_head * bread (int dev, unsigned long block, size_t size);
 struct buffer_head * reiserfs_bread (int dev, unsigned long block, int size, int *repeat);
-int valid_offset (int fd, loff_t offset);
 int bwrite (struct buffer_head * bh);
 void brelse (struct buffer_head * bh);
 void bforget (struct buffer_head * bh);
@@ -67,6 +66,3 @@ void do_fsck_rollback (int fd_device, int fd_journal_device, FILE * log);
 void flush_buffers (int);
 void free_buffers (void);
 void invalidate_buffers (int);
-
-
-int user_confirmed (FILE * fp, char * q, char * yes);

include/misc.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-2003 by Hans Reiser, licensing governed by 
+ * Copyright 1996-2004 by Hans Reiser, licensing governed by 
  * reiserfsprogs/README
  */
 
@@ -13,10 +13,16 @@
 #include <linux/major.h>
 #include <signal.h>
 #include <unistd.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+
+#include <sys/types.h>
 
 #define POSITION_FOUND          8
 #define POSITION_NOT_FOUND      9
 
+#define INVAL_PTR	(void *)-1
+
 void check_memory_msg(void);
 void die (char * fmt, ...) __attribute__ ((format (printf, 1, 2)));
 void * getmem (int size);
@@ -25,11 +31,24 @@ void freemem (void * p);
 void checkmem (char * p, int size);
 void * expandmem (void * p, int size, int by);
 unsigned int get_mem_size (char * p);
-int is_mounted (char * device_name);
-int is_mounted_read_only (char * device_name);
 void check_and_free_mem (void);
 char * kdevname (int dev);
 
+typedef enum mount_flags {
+	MF_NOT_MOUNTED  = 0x0,
+	MF_RO		= 0x1,
+	MF_RW		= 0x2
+} mount_flags_t;
+
+typedef struct mount_hint {
+    char *point;	/* Mount point. */
+    __u32 psize;	/* Mount point buffer size. */
+    __u32 flags;	/* Mount flags. */
+} mount_hint_t;
+
+struct mntent *misc_mntent(char *device);
+int misc_device_mounted(char *device);
+	
 void misc_print_credit(FILE *out);
 
 typedef struct dma_info {
@@ -44,16 +63,15 @@ int prepare_dma_check(dma_info_t *dma_info);
 int get_dma_info(dma_info_t *dma_info);
 void clean_after_dma_check(int fd, dma_info_t *dma_info);
 
+int valid_offset( int fd, loff_t offset);
+unsigned long count_blocks (char * filename, int blocksize);
+
 void print_how_far (FILE * fp, unsigned long *passed, unsigned long total, unsigned int inc, int quiet);
 void print_how_fast (unsigned long total, 
 		     unsigned long passed, int cursor_pos, int reset_time);
 __u32 get_random (void);
-int uuid_is_null(unsigned char * uuid);
-int generate_random_uuid (unsigned char * uuid);
-int uuid_is_correct (unsigned char * uuid);
-int set_uuid (const unsigned char * text, unsigned char * UUID);
 
-//#include <asm/bitops.h>
+int user_confirmed (FILE * fp, char * q, char * yes);
 
 extern inline int misc_set_bit (unsigned long long nr, void * addr);
 extern inline int misc_clear_bit (unsigned long long nr, void * addr);
@@ -85,15 +103,13 @@ extern inline unsigned long long misc_find_first_set_bit (const void *vaddr, uns
 # error "nuxi/pdp-endian archs are not supported"
 #endif
 
+#define STAT_FIELD_H(Field, Type)	\
+inline Type misc_device_##Field(char *device);
 
-
-unsigned long count_blocks (char * filename, int blocksize);
-
-mode_t get_st_mode (char * file_name);
-dev_t get_st_rdev (char * file_name);
-off64_t get_st_size (char * file_name);
-blkcnt64_t get_st_blocks (char * file_name);
-
+STAT_FIELD_H(mode, mode_t);
+STAT_FIELD_H(rdev, dev_t);
+STAT_FIELD_H(size, off64_t);
+STAT_FIELD_H(blocks, blkcnt64_t);
 
 /* these are to access bitfield in endian safe manner */
 __u16 mask16 (int from, int count);

include/reiserfs_fs.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-2003 by Hans Reiser, licensing governed by 
+ * Copyright 1996-2004 by Hans Reiser, licensing governed by 
  * reiserfsprogs/README
  */
 
@@ -1020,6 +1020,12 @@ struct disk_child {
 #define get_dc_child_size(dc)		get_le16 (dc, dc2_size)
 #define set_dc_child_size(dc,val)	set_le16 (dc, dc2_size, val)
 
+#define set_dc(dc, size, blocknr)	\
+({					\
+    set_dc_child_blocknr(dc, blocknr);	\
+    set_dc_child_size(dc, size);	\
+    set_le16(dc, dc2_reserved, 0);	\
+})
 
 /* Get disk child by buffer header and position in the tree node. */
 #define B_N_CHILD(p_s_bh,n_pos)  ((struct disk_child *)\

include/reiserfs_lib.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2000-2003 by Hans Reiser, licensing governed by 
+ *  Copyright 2000-2004 by Hans Reiser, licensing governed by 
  *  reiserfsprogs/README
  */
 
@@ -7,8 +7,10 @@
 #define REISERFS_LIB_H
 
 
-typedef struct reiserfs_filsys reiserfs_filsys_t;
+#define BADBLOCK_DIRID	1
+#define BADBLOCK_OBJID  (__u32)-1
 
+typedef struct reiserfs_filsys reiserfs_filsys_t;
 
 #include "reiserfs_fs.h"
 
@@ -86,8 +88,6 @@ void reiserfs_close (reiserfs_filsys_t *);
 void reiserfs_reopen (reiserfs_filsys_t *, int flags);
 int is_opened_rw (reiserfs_filsys_t * fs);
 
-struct key * get_next_key_2 (struct path * path);
-
 /*
 void reiserfs_read_bitmap_blocks (reiserfs_filsys_t *);
 void reiserfs_free_bitmap_blocks (reiserfs_filsys_t *);
@@ -146,9 +146,14 @@ void make_sure_root_dir_exists (reiserfs_filsys_t * fs,
 				void (*modyfy_item)(struct item_head *, void *),
 				int ih_flags);
 
+typedef void (*badblock_func_t) (reiserfs_filsys_t *fs, 
+				 struct path *badblock_path, 
+				 void *data);
+
+void mark_badblock(reiserfs_filsys_t *fs, struct path *badblock_path, void *data);
 int create_badblock_bitmap (reiserfs_filsys_t * fs, char * badblocks_file);
 void add_badblock_list (reiserfs_filsys_t * fs, int no_badblock_in_tree_yet);
-
+void badblock_list(reiserfs_filsys_t * fs, badblock_func_t action, void *data);
 
 extern struct key root_dir_key;
 extern struct key parent_root_dir_key;

include/swab.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2002-2003 by Hans Reiser, licensing governed by 
+ *  Copyright 2002-2004 by Hans Reiser, licensing governed by 
  *  reiserfsprogs/README
  */