diff --git a/[refs] b/[refs] index 02e7fb6793ce..c2db506b26f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3268a2468eb6a31af89930cbae58a62fe6ca6d2d +refs/heads/master: 1214b53f90131fee1f950010c43e92455fe598ab diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c index 20452c110d7d..fa48051484b8 100644 --- a/trunk/fs/btrfs/file.c +++ b/trunk/fs/btrfs/file.c @@ -2242,6 +2242,7 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int origin) if (lockend <= lockstart) lockend = lockstart + root->sectorsize; + lockend--; len = lockend - lockstart + 1; len = max_t(u64, len, root->sectorsize);