projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Btrfs: skip btrfs_release_path in btrfs_update_root and btrfs_del_root
[cascardo/linux.git]
/
fs
/
btrfs
/
compression.c
diff --git
a/fs/btrfs/compression.c
b/fs/btrfs/compression.c
index
de1e2fd
..
a11a320
100644
(file)
--- a/
fs/btrfs/compression.c
+++ b/
fs/btrfs/compression.c
@@
-26,7
+26,6
@@
#include <linux/time.h>
#include <linux/init.h>
#include <linux/string.h>
#include <linux/time.h>
#include <linux/init.h>
#include <linux/string.h>
-#include <linux/smp_lock.h>
#include <linux/backing-dev.h>
#include <linux/mpage.h>
#include <linux/swap.h>
#include <linux/backing-dev.h>
#include <linux/mpage.h>
#include <linux/swap.h>
@@
-507,10
+506,10
@@
static noinline int add_ra_bio_pages(struct inode *inode,
*/
set_page_extent_mapped(page);
lock_extent(tree, last_offset, end, GFP_NOFS);
*/
set_page_extent_mapped(page);
lock_extent(tree, last_offset, end, GFP_NOFS);
-
spin
_lock(&em_tree->lock);
+
read
_lock(&em_tree->lock);
em = lookup_extent_mapping(em_tree, last_offset,
PAGE_CACHE_SIZE);
em = lookup_extent_mapping(em_tree, last_offset,
PAGE_CACHE_SIZE);
-
spin
_unlock(&em_tree->lock);
+
read
_unlock(&em_tree->lock);
if (!em || last_offset < em->start ||
(last_offset + PAGE_CACHE_SIZE > extent_map_end(em)) ||
if (!em || last_offset < em->start ||
(last_offset + PAGE_CACHE_SIZE > extent_map_end(em)) ||
@@
-594,11
+593,11
@@
int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
em_tree = &BTRFS_I(inode)->extent_tree;
/* we need the actual starting offset of this extent in the file */
em_tree = &BTRFS_I(inode)->extent_tree;
/* we need the actual starting offset of this extent in the file */
-
spin
_lock(&em_tree->lock);
+
read
_lock(&em_tree->lock);
em = lookup_extent_mapping(em_tree,
page_offset(bio->bi_io_vec->bv_page),
PAGE_CACHE_SIZE);
em = lookup_extent_mapping(em_tree,
page_offset(bio->bi_io_vec->bv_page),
PAGE_CACHE_SIZE);
-
spin
_unlock(&em_tree->lock);
+
read
_unlock(&em_tree->lock);
compressed_len = em->block_len;
cb = kmalloc(compressed_bio_size(root, compressed_len), GFP_NOFS);
compressed_len = em->block_len;
cb = kmalloc(compressed_bio_size(root, compressed_len), GFP_NOFS);