summaryrefslogtreecommitdiff
path: root/fs/aufs/vdir.c
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-06-10 05:30:17 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-06-10 05:30:17 -0300
commitd635711daa98be86d4c7fd01499c34f566b54ccb (patch)
treeaa5cc3760a27c3d57146498cb82fa549547de06c /fs/aufs/vdir.c
parentc91265cd0efb83778f015b4d4b1129bd2cfd075e (diff)
Linux-libre 4.6.2-gnu
Diffstat (limited to 'fs/aufs/vdir.c')
-rw-r--r--fs/aufs/vdir.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/aufs/vdir.c b/fs/aufs/vdir.c
index f64cc2b7a..feddcc204 100644
--- a/fs/aufs/vdir.c
+++ b/fs/aufs/vdir.c
@@ -538,7 +538,7 @@ static int au_do_read_vdir(struct fillvdir_arg *arg)
int err;
unsigned int rdhash;
loff_t offset;
- aufs_bindex_t bend, bindex, bstart;
+ aufs_bindex_t bbot, bindex, btop;
unsigned char shwh;
struct file *hf, *file;
struct super_block *sb;
@@ -564,9 +564,9 @@ static int au_do_read_vdir(struct fillvdir_arg *arg)
shwh = 1;
au_fset_fillvdir(arg->flags, SHWH);
}
- bstart = au_fbstart(file);
- bend = au_fbend_dir(file);
- for (bindex = bstart; !err && bindex <= bend; bindex++) {
+ btop = au_fbtop(file);
+ bbot = au_fbbot_dir(file);
+ for (bindex = btop; !err && bindex <= bbot; bindex++) {
hf = au_hf_dir(file, bindex);
if (!hf)
continue;
@@ -579,7 +579,7 @@ static int au_do_read_vdir(struct fillvdir_arg *arg)
arg->bindex = bindex;
au_fclr_fillvdir(arg->flags, WHABLE);
if (shwh
- || (bindex != bend
+ || (bindex != bbot
&& au_br_whable(au_sbr_perm(sb, bindex))))
au_fset_fillvdir(arg->flags, WHABLE);
do {