Skip to content

L
linux-davinci
Commit 5d4fb734 authored by Chris Mason's avatar Chris Mason
Browse files
Options

Btrfs: Fix an off by one in the extent_map prepare write code 

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 1832a6d5
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
fs/btrfs/extent_map.c
View file @ 5d4fb734
......@@ -2279,7 +2279,7 @@ int extent_prepare_write(struct extent_map_tree *tree,
u64 extent_offset = block_start - em->start;
size_t iosize;
sector = (em->block_start + extent_offset) >> 9;
iosize = (cur_end - block_start + blocksize - 1) &
iosize = (cur_end - block_start + blocksize) &
~((u64)blocksize - 1);
/*
* we've already got the extent locked, but we
......
fs/btrfs/inode.c
View file @ 5d4fb734
......@@ -1956,7 +1956,7 @@ static int btrfs_prepare_write(struct file *file, struct page *page,
mutex_lock(&root->fs_info->fs_mutex);
err = btrfs_check_free_space(root, PAGE_CACHE_SIZE, 0);
mutex_lock(&root->fs_info->fs_mutex);
mutex_unlock(&root->fs_info->fs_mutex);
if (err)
return -ENOSPC;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment