aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/dir.h
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-03-20 12:30:04 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2006-03-20 12:30:04 -0500
commitc752666c17f870fa8ae9f16804dd457e9e6daaec (patch)
treec3c48383f386a24edbdf3c6292f25b587e6d9368 /fs/gfs2/dir.h
parent419c93e0b6b9eef0bf26b8ad415f2a5bf4300119 (diff)
[GFS2] Fix bug in directory code and tidy up
Due to a typo, the dir leaf split operation was (for the first split in a directory) writing the new hash vaules at the wrong offset. This is now fixed. Also some other tidy ups are included: - We use GFS2's hash function for dentries (see ops_dentry.c) so that we don't have to keep recalculating the hash values. - A lot of common code is eliminated between the various directory lookup routines. - Better error checking on directory lookup (previously different routines checked for different errors) - The leaf split operation has a couple of redundant operations removed from it, so it should be faster. There is still further scope for further clean ups in the directory code, and readdir in particular could do with slimming down a bit. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/dir.h')
-rw-r--r--fs/gfs2/dir.h39
1 files changed, 24 insertions, 15 deletions
diff --git a/fs/gfs2/dir.h b/fs/gfs2/dir.h
index 5b01497b3ab3..8fd4dc0f700e 100644
--- a/fs/gfs2/dir.h
+++ b/fs/gfs2/dir.h
@@ -27,25 +27,34 @@ typedef int (*gfs2_filldir_t) (void *opaque,
27 uint64_t offset, 27 uint64_t offset,
28 struct gfs2_inum *inum, unsigned int type); 28 struct gfs2_inum *inum, unsigned int type);
29 29
30int gfs2_filecmp(struct qstr *file1, char *file2, int len_of_file2); 30int gfs2_dir_search(struct inode *dir, const struct qstr *filename,
31int gfs2_dirent_alloc(struct gfs2_inode *dip, struct buffer_head *bh, 31 struct gfs2_inum *inum, unsigned int *type);
32 int name_len, struct gfs2_dirent **dent_out); 32int gfs2_dir_add(struct inode *inode, const struct qstr *filename,
33 33 const struct gfs2_inum *inum, unsigned int type);
34int gfs2_dir_search(struct gfs2_inode *dip, struct qstr *filename, 34int gfs2_dir_del(struct gfs2_inode *dip, const struct qstr *filename);
35 struct gfs2_inum *inum, unsigned int *type);
36int gfs2_dir_add(struct gfs2_inode *dip, struct qstr *filename,
37 struct gfs2_inum *inum, unsigned int type);
38int gfs2_dir_del(struct gfs2_inode *dip, struct qstr *filename);
39int gfs2_dir_read(struct gfs2_inode *dip, uint64_t * offset, void *opaque, 35int gfs2_dir_read(struct gfs2_inode *dip, uint64_t * offset, void *opaque,
40 gfs2_filldir_t filldir); 36 gfs2_filldir_t filldir);
41int gfs2_dir_mvino(struct gfs2_inode *dip, struct qstr *filename, 37int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename,
42 struct gfs2_inum *new_inum, unsigned int new_type); 38 struct gfs2_inum *new_inum, unsigned int new_type);
43 39
44int gfs2_dir_exhash_dealloc(struct gfs2_inode *dip); 40int gfs2_dir_exhash_dealloc(struct gfs2_inode *dip);
45 41
46int gfs2_diradd_alloc_required(struct gfs2_inode *dip, struct qstr *filename, 42int gfs2_diradd_alloc_required(struct inode *dir,
47 int *alloc_required); 43 const struct qstr *filename);
48int gfs2_dir_get_buffer(struct gfs2_inode *ip, uint64_t block, int new, 44int gfs2_dir_get_buffer(struct gfs2_inode *ip, uint64_t block, int new,
49 struct buffer_head **bhp); 45 struct buffer_head **bhp);
46
47/* N.B. This probably ought to take inum & type as args as well */
48static inline void gfs2_qstr2dirent(const struct qstr *name, u16 reclen, struct gfs2_dirent *dent)
49{
50 dent->de_inum.no_addr = cpu_to_be64(0);
51 dent->de_inum.no_formal_ino = cpu_to_be64(0);
52 dent->de_hash = cpu_to_be32(name->hash);
53 dent->de_rec_len = cpu_to_be16(reclen);
54 dent->de_name_len = cpu_to_be16(name->len);
55 dent->de_type = cpu_to_be16(0);
56 memset(dent->__pad, 0, sizeof(dent->__pad));
57 memcpy((char*)(dent+1), name->name, name->len);
58}
50 59
51#endif /* __DIR_DOT_H__ */ 60#endif /* __DIR_DOT_H__ */