diff --git a/[refs] b/[refs] index b50249d8f9cb..c9786c3c1f5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4f722fa42537bcb0ff14322a57dc3870d093cab +refs/heads/master: 89f135d8b53bcccafd91a075366d2704ba257cf3 diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index 288c2cdc7543..2bb65e9b1448 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -3263,7 +3263,7 @@ static int btrfs_real_readdir(struct file *filp, void *dirent, /* Reached end of directory/root. Bump pos past the last item. */ if (key_type == BTRFS_DIR_INDEX_KEY) - filp->f_pos = INT_LIMIT(typeof(filp->f_pos)); + filp->f_pos = INT_LIMIT(off_t); else filp->f_pos++; nopos: