diff --git a/[refs] b/[refs]
index bbe5e2ff9cdb..4ea0b1a4977d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bea495e5b4d9746f26cf5b4100d24c77c3dcbd84
+refs/heads/master: c2a8b6e11009398ca9363d8ba8d4e7e40fb897fd
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 16d3aef45d18..026bc9c4c90d 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -1430,7 +1430,7 @@ static int btrfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 			di = (struct btrfs_dir_item *)((char *)di + di_len);
 		}
 	}
-	filp->f_pos++;
+	filp->f_pos = INT_LIMIT(typeof(filp->f_pos));
 nopos:
 	ret = 0;
 err: