aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/dir.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/dir.c')
-rw-r--r--fs/gfs2/dir.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 40e94ac0b93d..459498cac93b 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -81,7 +81,7 @@
81#define gfs2_disk_hash2offset(h) (((u64)(h)) >> 1) 81#define gfs2_disk_hash2offset(h) (((u64)(h)) >> 1)
82#define gfs2_dir_offset2hash(p) ((u32)(((u64)(p)) << 1)) 82#define gfs2_dir_offset2hash(p) ((u32)(((u64)(p)) << 1))
83 83
84typedef int (*leaf_call_t) (struct gfs2_inode *dip, u32 index, u32 len, 84typedef int (*leaf_call_t) (struct gfs2_inode *dip, u32 index, u32 len,
85 u64 leaf_no, void *data); 85 u64 leaf_no, void *data);
86typedef int (*gfs2_dscan_t)(const struct gfs2_dirent *dent, 86typedef int (*gfs2_dscan_t)(const struct gfs2_dirent *dent,
87 const struct qstr *name, void *opaque); 87 const struct qstr *name, void *opaque);
@@ -119,7 +119,6 @@ static int gfs2_dir_get_existing_buffer(struct gfs2_inode *ip, u64 block,
119 119
120static int gfs2_dir_write_stuffed(struct gfs2_inode *ip, const char *buf, 120static int gfs2_dir_write_stuffed(struct gfs2_inode *ip, const char *buf,
121 unsigned int offset, unsigned int size) 121 unsigned int offset, unsigned int size)
122
123{ 122{
124 struct buffer_head *dibh; 123 struct buffer_head *dibh;
125 int error; 124 int error;
@@ -685,7 +684,7 @@ static struct gfs2_dirent *gfs2_dirent_alloc(struct inode *inode,
685 const struct qstr *name) 684 const struct qstr *name)
686{ 685{
687 struct gfs2_dirent *dent; 686 struct gfs2_dirent *dent;
688 dent = gfs2_dirent_scan(inode, bh->b_data, bh->b_size, 687 dent = gfs2_dirent_scan(inode, bh->b_data, bh->b_size,
689 gfs2_dirent_find_space, name, NULL); 688 gfs2_dirent_find_space, name, NULL);
690 if (!dent || IS_ERR(dent)) 689 if (!dent || IS_ERR(dent))
691 return dent; 690 return dent;
@@ -764,7 +763,7 @@ static struct gfs2_dirent *gfs2_dirent_search(struct inode *inode,
764 gfs2_consist_inode(ip); 763 gfs2_consist_inode(ip);
765 return ERR_PTR(-EIO); 764 return ERR_PTR(-EIO);
766 } 765 }
767 766
768 index = name->hash >> (32 - ip->i_di.di_depth); 767 index = name->hash >> (32 - ip->i_di.di_depth);
769 error = get_first_leaf(ip, index, &bh); 768 error = get_first_leaf(ip, index, &bh);
770 if (error) 769 if (error)
@@ -779,14 +778,14 @@ static struct gfs2_dirent *gfs2_dirent_search(struct inode *inode,
779 brelse(bh); 778 brelse(bh);
780 if (!ln) 779 if (!ln)
781 break; 780 break;
782 781
783 error = get_leaf(ip, ln, &bh); 782 error = get_leaf(ip, ln, &bh);
784 } while(!error); 783 } while(!error);
785 784
786 return error ? ERR_PTR(error) : NULL; 785 return error ? ERR_PTR(error) : NULL;
787 } 786 }
788 787
789 788
790 error = gfs2_meta_inode_buffer(ip, &bh); 789 error = gfs2_meta_inode_buffer(ip, &bh);
791 if (error) 790 if (error)
792 return ERR_PTR(error); 791 return ERR_PTR(error);
@@ -810,7 +809,7 @@ static struct gfs2_leaf *new_leaf(struct inode *inode, struct buffer_head **pbh,
810 struct qstr name = { .name = "", .len = 0, .hash = 0 }; 809 struct qstr name = { .name = "", .len = 0, .hash = 0 };
811 if (!bh) 810 if (!bh)
812 return NULL; 811 return NULL;
813 812
814 gfs2_trans_add_bh(ip->i_gl, bh, 1); 813 gfs2_trans_add_bh(ip->i_gl, bh, 1);
815 gfs2_metatype_set(bh, GFS2_METATYPE_LF, GFS2_FORMAT_LF); 814 gfs2_metatype_set(bh, GFS2_METATYPE_LF, GFS2_FORMAT_LF);
816 leaf = (struct gfs2_leaf *)bh->b_data; 815 leaf = (struct gfs2_leaf *)bh->b_data;