From 755dc5cff362709f5ef9804154e22ba7914c21a5 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Tue, 11 Jul 2006 13:19:13 -0400 Subject: [PATCH] --- yaml --- r: 38747 b: refs/heads/master c: 4da3c6463ef6759fb50d12c8652bc29c5c1730a4 h: refs/heads/master i: 38745: 7139b98f29396f219517bc76d132237cc270cc44 38743: dac322ff6f5e4de4080869cba69943da8ccdf1af v: v3 --- [refs] | 2 +- trunk/fs/gfs2/dir.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 17db1c2091f5..b1a8e8002656 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2a580d87b33816aa9b50268f70666368e12f7df +refs/heads/master: 4da3c6463ef6759fb50d12c8652bc29c5c1730a4 diff --git a/trunk/fs/gfs2/dir.c b/trunk/fs/gfs2/dir.c index 13d3709e0c0b..e96b5322c843 100644 --- a/trunk/fs/gfs2/dir.c +++ b/trunk/fs/gfs2/dir.c @@ -936,7 +936,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) struct gfs2_inode *dip = GFS2_I(inode); struct buffer_head *nbh, *obh, *dibh; struct gfs2_leaf *nleaf, *oleaf; - struct gfs2_dirent *dent, *prev = NULL, *next = NULL, *new; + struct gfs2_dirent *dent = NULL, *prev = NULL, *next = NULL, *new; uint32_t start, len, half_len, divider; uint64_t bn, *lp, leaf_no; uint32_t index; @@ -1356,7 +1356,7 @@ static int dir_e_read(struct inode *inode, uint64_t *offset, void *opaque, uint64_t *lp; int copied = 0; int error = 0; - unsigned depth; + unsigned depth = 0; hsize = 1 << dip->i_di.di_depth; if (hsize * sizeof(uint64_t) != dip->i_di.di_size) {