diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2012-03-01 14:57:19 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2012-03-22 01:45:35 +0100 |
| commit | d0082371cf086e0ba2bbd0367b2c9920532df24f (patch) | |
| tree | 4ae3fb6565f36fd606ab6e4b83d489e66b3b86d7 /fs/btrfs/file.c | |
| parent | btrfs: return void in functions without error conditions (diff) | |
| download | linux-d0082371cf086e0ba2bbd0367b2c9920532df24f.tar.xz linux-d0082371cf086e0ba2bbd0367b2c9920532df24f.zip | |
btrfs: drop gfp_t from lock_extent
lock_extent and unlock_extent are always called with GFP_NOFS, drop the
argument and use GFP_NOFS consistently.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index e8d06b6b9194..0eb80cc4ec81 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1105,8 +1105,7 @@ again: if (start_pos < inode->i_size) { struct btrfs_ordered_extent *ordered; lock_extent_bits(&BTRFS_I(inode)->io_tree, - start_pos, last_pos - 1, 0, &cached_state, - GFP_NOFS); + start_pos, last_pos - 1, 0, &cached_state); ordered = btrfs_lookup_first_ordered_extent(inode, last_pos - 1); if (ordered && @@ -1638,7 +1637,7 @@ static long btrfs_fallocate(struct file *file, int mode, * transaction */ lock_extent_bits(&BTRFS_I(inode)->io_tree, alloc_start, - locked_end, 0, &cached_state, GFP_NOFS); + locked_end, 0, &cached_state); ordered = btrfs_lookup_first_ordered_extent(inode, alloc_end - 1); if (ordered && @@ -1737,7 +1736,7 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int origin) return -ENXIO; lock_extent_bits(&BTRFS_I(inode)->io_tree, lockstart, lockend, 0, - &cached_state, GFP_NOFS); + &cached_state); /* * Delalloc is such a pain. If we have a hole and we have pending |