From: Yan Zheng <yanzheng@21cn.com>
Date: Tue, 19 Feb 2008 16:41:02 +0000 (-0500)
Subject: Btrfs: Fix looping on readdir of the subvol roots
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5e591a0703bc03047d37938586f97fd8ca960c08;p=deliverable%2Flinux.git

Btrfs: Fix looping on readdir of the subvol roots

Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

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: