summary refs log tree commit diff
path: root/fs
diff options
context:
space:
mode:
authorYan Zheng <yanzheng@21cn.com>2008-02-19 11:41:02 -0500
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:04:00 -0400
commit5e591a0703bc03047d37938586f97fd8ca960c08 (patch)
tree010c83864a48a34c78f9697bb0ab34d8a0fda4ba /fs
parent0762704b196d41941a9b439e9165efaf85c6609e (diff)
downloadlinux-5e591a0703bc03047d37938586f97fd8ca960c08.tar.gz
Btrfs: Fix looping on readdir of the subvol roots
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/inode.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 913ab128eee1..3e79572a5cb1 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1465,7 +1465,10 @@ read_dir_items:
 			di = (struct btrfs_dir_item *)((char *)di + di_len);
 		}
 	}
-	filp->f_pos = INT_LIMIT(typeof(filp->f_pos));
+	if (key_type == BTRFS_DIR_INDEX_KEY)
+		filp->f_pos = INT_LIMIT(typeof(filp->f_pos));
+	else
+		filp->f_pos++;
 nopos:
 	ret = 0;
 err: