GFS2: Fix error code

[safe/jmp/linux-2.6] / fs / gfs2 / dir.h

diff --git a/fs/gfs2/dir.h b/fs/gfs2/dir.h
index f1f83fa..4f91944 100644 (file)
--- a/fs/gfs2/dir.h
+++ b/fs/gfs2/dir.h
@@ -10,32 +10,23 @@
 #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>
+#include <linux/crc32.h>
 
-typedef int (*gfs2_filldir_t) (void *opaque,
-                             const char *name, unsigned int length,
-                             u64 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, u64 * 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);
 
@@ -46,7 +37,7 @@ int gfs2_dir_get_new_buffer(struct gfs2_inode *ip, u64 block,
 
 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 +58,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__ */