X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Fgfs2%2Fdir.h;h=8a468cac9328abaa4a3b0444bf553caddcdac1ed;hb=10b275ddfd05ccb414cfe0cc56a0f47ff20fe807;hp=173403095eb2215fda0f2016adf42b88e8d00e70;hpb=2b3d6e2f23362b71de173649002d915d14e07622;p=linux-2.6-omap-h63xx.git

diff --git a/fs/gfs2/dir.h b/fs/gfs2/dir.h
index 173403095eb..8a468cac932 100644
--- a/fs/gfs2/dir.h
+++ b/fs/gfs2/dir.h
@@ -4,49 +4,39 @@
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
 #ifndef __DIR_DOT_H__
 #define __DIR_DOT_H__
 
-/**
- * gfs2_filldir_t - Report a directory entry to the caller of gfs2_dir_read()
- * @opaque: opaque data used by the function
- * @name: the name of the directory entry
- * @length: the length of the name
- * @offset: the entry's offset in the directory
- * @inum: the inode number the entry points to
- * @type: the type of inode the entry points to
- *
- * Returns: 0 on success, 1 if buffer full
- */
+#include <linux/dcache.h>
 
-typedef int (*gfs2_filldir_t) (void *opaque,
-			      const char *name, unsigned int length,
-			      uint64_t offset,
-			      struct gfs2_inum *inum, unsigned int type);
+struct inode;
+struct gfs2_inode;
+struct gfs2_inum;
 
-int gfs2_dir_search(struct inode *dir, const struct qstr *filename,
-		    struct gfs2_inum *inum, unsigned int *type);
+struct inode *gfs2_dir_search(struct inode *dir, const struct qstr *filename);
+int gfs2_dir_check(struct inode *dir, const struct qstr *filename,
+		   const struct gfs2_inode *ip);
 int gfs2_dir_add(struct inode *inode, const struct qstr *filename,
-		 const struct gfs2_inum *inum, unsigned int type);
+		 const struct gfs2_inode *ip, unsigned int type);
 int gfs2_dir_del(struct gfs2_inode *dip, const struct qstr *filename);
-int gfs2_dir_read(struct inode *inode, uint64_t * offset, void *opaque,
-		  gfs2_filldir_t filldir);
+int gfs2_dir_read(struct inode *inode, u64 *offset, void *opaque,
+		  filldir_t filldir);
 int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename,
-		   struct gfs2_inum *new_inum, unsigned int new_type);
+		   const struct gfs2_inode *nip, unsigned int new_type);
 
 int gfs2_dir_exhash_dealloc(struct gfs2_inode *dip);
 
 int gfs2_diradd_alloc_required(struct inode *dir,
 			       const struct qstr *filename);
-int gfs2_dir_get_new_buffer(struct gfs2_inode *ip, uint64_t block,
+int gfs2_dir_get_new_buffer(struct gfs2_inode *ip, u64 block,
 			    struct buffer_head **bhp);
 
-static inline uint32_t gfs2_disk_hash(const char *data, int len)
+static inline u32 gfs2_disk_hash(const char *data, int len)
 {
-        return crc32_le(0xFFFFFFFF, data, len) ^ 0xFFFFFFFF;
+        return crc32_le((u32)~0, data, len) ^ (u32)~0;
 }
 
 
@@ -67,7 +57,7 @@ static inline void gfs2_qstr2dirent(const struct qstr *name, u16 reclen, struct
 	dent->de_name_len = cpu_to_be16(name->len);
 	dent->de_type = cpu_to_be16(0);
 	memset(dent->__pad, 0, sizeof(dent->__pad));
-	memcpy((char*)(dent+1), name->name, name->len);
+	memcpy(dent + 1, name->name, name->len);
 }
 
 #endif /* __DIR_DOT_H__ */