p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'for-chris-4.11-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.11

This commit is contained in:
Chris Mason 2017-02-28 14:35:09 -08:00
parent ef6ebf3242 20a7db8ab3
commit e9f467d028
31 changed files with 673 additions and 626 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fs/btrfs/btrfs_inode.h
View File

@ -237,20 +237,20 @@ static inline u64 btrfs_ino(struct btrfs_inode *inode)
return ino; return ino;
} }
static inline void btrfs_i_size_write(struct inode *inode, u64 size) static inline void btrfs_i_size_write(struct btrfs_inode *inode, u64 size)
{ {
i_size_write(inode, size); i_size_write(&inode->vfs_inode, size);
BTRFS_I(inode)->disk_i_size = size; inode->disk_i_size = size;
} }
static inline bool btrfs_is_free_space_inode(struct inode *inode) static inline bool btrfs_is_free_space_inode(struct btrfs_inode *inode)
{ {
struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_root *root = inode->root;
if (root == root->fs_info->tree_root && if (root == root->fs_info->tree_root &&
btrfs_ino(BTRFS_I(inode)) != BTRFS_BTREE_INODE_OBJECTID) btrfs_ino(inode) != BTRFS_BTREE_INODE_OBJECTID)
return true; return true;
if (BTRFS_I(inode)->location.objectid == BTRFS_FREE_INO_OBJECTID) if (inode->location.objectid == BTRFS_FREE_INO_OBJECTID)
return true; return true;
return false; return false;
} }
@ -311,34 +311,33 @@ struct btrfs_dio_private {
* to grab i_mutex. It is used to avoid the endless truncate due to * to grab i_mutex. It is used to avoid the endless truncate due to
* nonlocked dio read. * nonlocked dio read.
*/ */
static inline void btrfs_inode_block_unlocked_dio(struct inode *inode) static inline void btrfs_inode_block_unlocked_dio(struct btrfs_inode *inode)
{ {
set_bit(BTRFS_INODE_READDIO_NEED_LOCK, &BTRFS_I(inode)->runtime_flags); set_bit(BTRFS_INODE_READDIO_NEED_LOCK, &inode->runtime_flags);
smp_mb(); smp_mb();
} }
static inline void btrfs_inode_resume_unlocked_dio(struct inode *inode) static inline void btrfs_inode_resume_unlocked_dio(struct btrfs_inode *inode)
{ {
smp_mb__before_atomic(); smp_mb__before_atomic();
clear_bit(BTRFS_INODE_READDIO_NEED_LOCK, clear_bit(BTRFS_INODE_READDIO_NEED_LOCK, &inode->runtime_flags);
&BTRFS_I(inode)->runtime_flags);
} }
static inline void btrfs_print_data_csum_error(struct inode *inode, static inline void btrfs_print_data_csum_error(struct btrfs_inode *inode,
u64 logical_start, u32 csum, u32 csum_expected, int mirror_num) u64 logical_start, u32 csum, u32 csum_expected, int mirror_num)
{ {
struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_root *root = inode->root;
/* Output minus objectid, which is more meaningful */ /* Output minus objectid, which is more meaningful */
if (root->objectid >= BTRFS_LAST_FREE_OBJECTID) if (root->objectid >= BTRFS_LAST_FREE_OBJECTID)
btrfs_warn_rl(root->fs_info, btrfs_warn_rl(root->fs_info,
"csum failed root %lld ino %lld off %llu csum 0x%08x expected csum 0x%08x mirror %d", "csum failed root %lld ino %lld off %llu csum 0x%08x expected csum 0x%08x mirror %d",
root->objectid, btrfs_ino(BTRFS_I(inode)), root->objectid, btrfs_ino(inode),
logical_start, csum, csum_expected, mirror_num); logical_start, csum, csum_expected, mirror_num);
else else
btrfs_warn_rl(root->fs_info, btrfs_warn_rl(root->fs_info,
"csum failed root %llu ino %llu off %llu csum 0x%08x expected csum 0x%08x mirror %d", "csum failed root %llu ino %llu off %llu csum 0x%08x expected csum 0x%08x mirror %d",
root->objectid, btrfs_ino(BTRFS_I(inode)), root->objectid, btrfs_ino(inode),
logical_start, csum, csum_expected, mirror_num); logical_start, csum, csum_expected, mirror_num);
} }

43
fs/btrfs/compression.c
View File

@ -100,7 +100,7 @@ static struct bio *compressed_bio_alloc(struct block_device *bdev,
return btrfs_bio_alloc(bdev, first_byte >> 9, BIO_MAX_PAGES, gfp_flags); return btrfs_bio_alloc(bdev, first_byte >> 9, BIO_MAX_PAGES, gfp_flags);
} }
static int check_compressed_csum(struct inode *inode, static int check_compressed_csum(struct btrfs_inode *inode,
struct compressed_bio *cb, struct compressed_bio *cb,
u64 disk_start) u64 disk_start)
{ {
@ -111,7 +111,7 @@ static int check_compressed_csum(struct inode *inode,
u32 csum; u32 csum;
u32 *cb_sum = &cb->sums; u32 *cb_sum = &cb->sums;
if (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM) if (inode->flags & BTRFS_INODE_NODATASUM)
return 0; return 0;
for (i = 0; i < cb->nr_pages; i++) { for (i = 0; i < cb->nr_pages; i++) {
@ -125,7 +125,7 @@ static int check_compressed_csum(struct inode *inode,
if (csum != *cb_sum) { if (csum != *cb_sum) {
btrfs_print_data_csum_error(inode, disk_start, csum, btrfs_print_data_csum_error(inode, disk_start, csum,
*cb_sum, cb->mirror_num); *cb_sum, cb->mirror_num);
ret = -EIO; ret = -EIO;
goto fail; goto fail;
} }
@ -165,7 +165,7 @@ static void end_compressed_bio_read(struct bio *bio)
goto out; goto out;
inode = cb->inode; inode = cb->inode;
ret = check_compressed_csum(inode, cb, ret = check_compressed_csum(BTRFS_I(inode), cb,
(u64)bio->bi_iter.bi_sector << 9); (u64)bio->bi_iter.bi_sector << 9);
if (ret) if (ret)
goto csum_failed; goto csum_failed;
@ -911,32 +911,28 @@ static void free_workspaces(void)
} }
/* /*
* given an address space and start/len, compress the bytes. * Given an address space and start and length, compress the bytes into @pages
* that are allocated on demand.
* *
* pages are allocated to hold the compressed result and stored * @out_pages is an in/out parameter, holds maximum number of pages to allocate
* in 'pages' * and returns number of actually allocated pages
* *
* out_pages is used to return the number of pages allocated. There * @total_in is used to return the number of bytes actually read. It
* may be pages allocated even if we return an error * may be smaller than the input length if we had to exit early because we
*
* total_in is used to return the number of bytes actually read. It
* may be smaller then len if we had to exit early because we
* ran out of room in the pages array or because we cross the * ran out of room in the pages array or because we cross the
* max_out threshold. * max_out threshold.
* *
* total_out is used to return the total number of compressed bytes * @total_out is an in/out parameter, must be set to the input length and will
* be also used to return the total number of compressed bytes
* *
* max_out tells us the max number of bytes that we're allowed to * @max_out tells us the max number of bytes that we're allowed to
* stuff into pages * stuff into pages
*/ */
int btrfs_compress_pages(int type, struct address_space *mapping, int btrfs_compress_pages(int type, struct address_space *mapping,
u64 start, unsigned long len, u64 start, struct page **pages,
struct page **pages,
unsigned long nr_dest_pages,
unsigned long *out_pages, unsigned long *out_pages,
unsigned long *total_in, unsigned long *total_in,
unsigned long *total_out, unsigned long *total_out)
unsigned long max_out)
{ {
struct list_head *workspace; struct list_head *workspace;
int ret; int ret;
@ -944,10 +940,9 @@ int btrfs_compress_pages(int type, struct address_space *mapping,
workspace = find_workspace(type); workspace = find_workspace(type);
ret = btrfs_compress_op[type-1]->compress_pages(workspace, mapping, ret = btrfs_compress_op[type-1]->compress_pages(workspace, mapping,
start, len, pages, start, pages,
nr_dest_pages, out_pages, out_pages,
total_in, total_out, total_in, total_out);
max_out);
free_workspace(type, workspace); free_workspace(type, workspace);
return ret; return ret;
} }
@ -1015,7 +1010,7 @@ void btrfs_exit_compress(void)
* *
* total_out is the last byte of the buffer * total_out is the last byte of the buffer
*/ */
int btrfs_decompress_buf2page(char *buf, unsigned long buf_start, int btrfs_decompress_buf2page(const char *buf, unsigned long buf_start,
unsigned long total_out, u64 disk_start, unsigned long total_out, u64 disk_start,
struct bio *bio) struct bio *bio)
{ {

30
fs/btrfs/compression.h
View File

@ -19,20 +19,32 @@
#ifndef __BTRFS_COMPRESSION_ #ifndef __BTRFS_COMPRESSION_
#define __BTRFS_COMPRESSION_ #define __BTRFS_COMPRESSION_
/*
* We want to make sure that amount of RAM required to uncompress an extent is
* reasonable, so we limit the total size in ram of a compressed extent to
* 128k. This is a crucial number because it also controls how easily we can
* spread reads across cpus for decompression.
*
* We also want to make sure the amount of IO required to do a random read is
* reasonably small, so we limit the size of a compressed extent to 128k.
*/
/* Maximum length of compressed data stored on disk */
#define BTRFS_MAX_COMPRESSED (SZ_128K)
/* Maximum size of data before compression */
#define BTRFS_MAX_UNCOMPRESSED (SZ_128K)
void btrfs_init_compress(void); void btrfs_init_compress(void);
void btrfs_exit_compress(void); void btrfs_exit_compress(void);
int btrfs_compress_pages(int type, struct address_space *mapping, int btrfs_compress_pages(int type, struct address_space *mapping,
u64 start, unsigned long len, u64 start, struct page **pages,
struct page **pages,
unsigned long nr_dest_pages,
unsigned long *out_pages, unsigned long *out_pages,
unsigned long *total_in, unsigned long *total_in,
unsigned long *total_out, unsigned long *total_out);
unsigned long max_out);
int btrfs_decompress(int type, unsigned char *data_in, struct page *dest_page, int btrfs_decompress(int type, unsigned char *data_in, struct page *dest_page,
unsigned long start_byte, size_t srclen, size_t destlen); unsigned long start_byte, size_t srclen, size_t destlen);
int btrfs_decompress_buf2page(char *buf, unsigned long buf_start, int btrfs_decompress_buf2page(const char *buf, unsigned long buf_start,
unsigned long total_out, u64 disk_start, unsigned long total_out, u64 disk_start,
struct bio *bio); struct bio *bio);
@ -59,13 +71,11 @@ struct btrfs_compress_op {
int (*compress_pages)(struct list_head *workspace, int (*compress_pages)(struct list_head *workspace,
struct address_space *mapping, struct address_space *mapping,
u64 start, unsigned long len, u64 start,
struct page **pages, struct page **pages,
unsigned long nr_dest_pages,
unsigned long *out_pages, unsigned long *out_pages,
unsigned long *total_in, unsigned long *total_in,
unsigned long *total_out, unsigned long *total_out);
unsigned long max_out);
int (*decompress_bio)(struct list_head *workspace, int (*decompress_bio)(struct list_head *workspace,
struct page **pages_in, struct page **pages_in,

2
fs/btrfs/ctree.c
View File

@ -453,8 +453,6 @@ __tree_mod_log_insert(struct btrfs_fs_info *fs_info, struct tree_mod_elem *tm)
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
struct tree_mod_elem *cur; struct tree_mod_elem *cur;
BUG_ON(!tm);
tm->seq = btrfs_inc_tree_mod_seq(fs_info); tm->seq = btrfs_inc_tree_mod_seq(fs_info);
tm_root = &fs_info->tree_mod_log; tm_root = &fs_info->tree_mod_log;

39
fs/btrfs/ctree.h
View File

@ -2687,7 +2687,7 @@ enum btrfs_flush_state {
}; };
int btrfs_check_data_free_space(struct inode *inode, u64 start, u64 len); int btrfs_check_data_free_space(struct inode *inode, u64 start, u64 len);
int btrfs_alloc_data_chunk_ondemand(struct inode *inode, u64 bytes); int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes);
void btrfs_free_reserved_data_space(struct inode *inode, u64 start, u64 len); void btrfs_free_reserved_data_space(struct inode *inode, u64 start, u64 len);
void btrfs_free_reserved_data_space_noquota(struct inode *inode, u64 start, void btrfs_free_reserved_data_space_noquota(struct inode *inode, u64 start,
u64 len); u64 len);
@ -2695,16 +2695,16 @@ void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info); struct btrfs_fs_info *fs_info);
void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans); void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans);
int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans, int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans,
struct inode *inode); struct btrfs_inode *inode);
void btrfs_orphan_release_metadata(struct inode *inode); void btrfs_orphan_release_metadata(struct btrfs_inode *inode);
int btrfs_subvolume_reserve_metadata(struct btrfs_root *root, int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
struct btrfs_block_rsv *rsv, struct btrfs_block_rsv *rsv,
int nitems, int nitems,
u64 *qgroup_reserved, bool use_global_rsv); u64 *qgroup_reserved, bool use_global_rsv);
void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info, void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info,
struct btrfs_block_rsv *rsv); struct btrfs_block_rsv *rsv);
int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes); int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes);
void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes); void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes);
int btrfs_delalloc_reserve_space(struct inode *inode, u64 start, u64 len); int btrfs_delalloc_reserve_space(struct inode *inode, u64 start, u64 len);
void btrfs_delalloc_release_space(struct inode *inode, u64 start, u64 len); void btrfs_delalloc_release_space(struct inode *inode, u64 start, u64 len);
void btrfs_init_block_rsv(struct btrfs_block_rsv *rsv, unsigned short type); void btrfs_init_block_rsv(struct btrfs_block_rsv *rsv, unsigned short type);
@ -2982,7 +2982,7 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,
const char *name, int name_len); const char *name, int name_len);
int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,
struct btrfs_root *root, const char *name, struct btrfs_root *root, const char *name,
int name_len, struct inode *dir, int name_len, struct btrfs_inode *dir,
struct btrfs_key *location, u8 type, u64 index); struct btrfs_key *location, u8 type, u64 index);
struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
@ -3081,7 +3081,7 @@ int btrfs_csum_one_bio(struct inode *inode, struct bio *bio,
u64 file_start, int contig); u64 file_start, int contig);
int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end, int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
struct list_head *list, int search_commit); struct list_head *list, int search_commit);
void btrfs_extent_item_to_extent_map(struct inode *inode, void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode,
const struct btrfs_path *path, const struct btrfs_path *path,
struct btrfs_file_extent_item *fi, struct btrfs_file_extent_item *fi,
const bool new_inline, const bool new_inline,
@ -3100,9 +3100,9 @@ struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode,
int delay_iput); int delay_iput);
void btrfs_wait_and_free_delalloc_work(struct btrfs_delalloc_work *work); void btrfs_wait_and_free_delalloc_work(struct btrfs_delalloc_work *work);
struct extent_map *btrfs_get_extent_fiemap(struct inode *inode, struct page *page, struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode,
size_t pg_offset, u64 start, u64 len, struct page *page, size_t pg_offset, u64 start,
int create); u64 len, int create);
noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len, noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,
u64 *orig_start, u64 *orig_block_len, u64 *orig_start, u64 *orig_block_len,
u64 *ram_bytes); u64 *ram_bytes);
@ -3123,13 +3123,13 @@ static inline void btrfs_force_ra(struct address_space *mapping,
} }
struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry); struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry);
int btrfs_set_inode_index(struct inode *dir, u64 *index); int btrfs_set_inode_index(struct btrfs_inode *dir, u64 *index);
int btrfs_unlink_inode(struct btrfs_trans_handle *trans, int btrfs_unlink_inode(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
struct btrfs_inode *dir, struct btrfs_inode *inode, struct btrfs_inode *dir, struct btrfs_inode *inode,
const char *name, int name_len); const char *name, int name_len);
int btrfs_add_link(struct btrfs_trans_handle *trans, int btrfs_add_link(struct btrfs_trans_handle *trans,
struct inode *parent_inode, struct inode *inode, struct btrfs_inode *parent_inode, struct btrfs_inode *inode,
const char *name, int name_len, int add_backref, u64 index); const char *name, int name_len, int add_backref, u64 index);
int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
@ -3166,15 +3166,16 @@ void btrfs_destroy_cachep(void);
long btrfs_ioctl_trans_end(struct file *file); long btrfs_ioctl_trans_end(struct file *file);
struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location, struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,
struct btrfs_root *root, int *was_new); struct btrfs_root *root, int *was_new);
struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page, struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,
size_t pg_offset, u64 start, u64 end, struct page *page, size_t pg_offset,
int create); u64 start, u64 end, int create);
int btrfs_update_inode(struct btrfs_trans_handle *trans, int btrfs_update_inode(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
struct inode *inode); struct inode *inode);
int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans, int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct inode *inode); struct btrfs_root *root, struct inode *inode);
int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode); int btrfs_orphan_add(struct btrfs_trans_handle *trans,
struct btrfs_inode *inode);
int btrfs_orphan_cleanup(struct btrfs_root *root); int btrfs_orphan_cleanup(struct btrfs_root *root);
void btrfs_orphan_commit_root(struct btrfs_trans_handle *trans, void btrfs_orphan_commit_root(struct btrfs_trans_handle *trans,
struct btrfs_root *root); struct btrfs_root *root);
@ -3215,11 +3216,11 @@ ssize_t btrfs_dedupe_file_range(struct file *src_file, u64 loff, u64 olen,
int btrfs_auto_defrag_init(void); int btrfs_auto_defrag_init(void);
void btrfs_auto_defrag_exit(void); void btrfs_auto_defrag_exit(void);
int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans, int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
struct inode *inode); struct btrfs_inode *inode);
int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info); int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info);
void btrfs_cleanup_defrag_inodes(struct btrfs_fs_info *fs_info); void btrfs_cleanup_defrag_inodes(struct btrfs_fs_info *fs_info);
int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync); int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync);
void btrfs_drop_extent_cache(struct inode *inode, u64 start, u64 end, void btrfs_drop_extent_cache(struct btrfs_inode *inode, u64 start, u64 end,
int skip_pinned); int skip_pinned);
extern const struct file_operations btrfs_file_operations; extern const struct file_operations btrfs_file_operations;
int __btrfs_drop_extents(struct btrfs_trans_handle *trans, int __btrfs_drop_extents(struct btrfs_trans_handle *trans,
@ -3233,7 +3234,7 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct inode *inode, u64 start, struct btrfs_root *root, struct inode *inode, u64 start,
u64 end, int drop_cache); u64 end, int drop_cache);
int btrfs_mark_extent_written(struct btrfs_trans_handle *trans, int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,
struct inode *inode, u64 start, u64 end); struct btrfs_inode *inode, u64 start, u64 end);
int btrfs_release_file(struct inode *inode, struct file *file); int btrfs_release_file(struct inode *inode, struct file *file);
int btrfs_dirty_pages(struct inode *inode, struct page **pages, int btrfs_dirty_pages(struct inode *inode, struct page **pages,
size_t num_pages, loff_t pos, size_t write_bytes, size_t num_pages, loff_t pos, size_t write_bytes,

2
fs/btrfs/delayed-inode.c
View File

@ -1790,7 +1790,7 @@ int btrfs_fill_inode(struct inode *inode, u32 *rdev)
i_uid_write(inode, btrfs_stack_inode_uid(inode_item)); i_uid_write(inode, btrfs_stack_inode_uid(inode_item));
i_gid_write(inode, btrfs_stack_inode_gid(inode_item)); i_gid_write(inode, btrfs_stack_inode_gid(inode_item));
btrfs_i_size_write(inode, btrfs_stack_inode_size(inode_item)); btrfs_i_size_write(BTRFS_I(inode), btrfs_stack_inode_size(inode_item));
inode->i_mode = btrfs_stack_inode_mode(inode_item); inode->i_mode = btrfs_stack_inode_mode(inode_item);
set_nlink(inode, btrfs_stack_inode_nlink(inode_item)); set_nlink(inode, btrfs_stack_inode_nlink(inode_item));
inode_set_bytes(inode, btrfs_stack_inode_nbytes(inode_item)); inode_set_bytes(inode, btrfs_stack_inode_nbytes(inode_item));

5
fs/btrfs/dev-replace.c
View File

@ -304,8 +304,9 @@ void btrfs_after_dev_replace_commit(struct btrfs_fs_info *fs_info)
dev_replace->cursor_left_last_write_of_item; dev_replace->cursor_left_last_write_of_item;
} }
int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info, char *tgtdev_name, int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
u64 srcdevid, char *srcdev_name, int read_src) const char *tgtdev_name, u64 srcdevid, const char *srcdev_name,
int read_src)
{ {
struct btrfs_root *root = fs_info->dev_root; struct btrfs_root *root = fs_info->dev_root;
struct btrfs_trans_handle *trans; struct btrfs_trans_handle *trans;

5
fs/btrfs/dev-replace.h
View File

@ -27,8 +27,9 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans,
void btrfs_after_dev_replace_commit(struct btrfs_fs_info *fs_info); void btrfs_after_dev_replace_commit(struct btrfs_fs_info *fs_info);
int btrfs_dev_replace_by_ioctl(struct btrfs_fs_info *fs_info, int btrfs_dev_replace_by_ioctl(struct btrfs_fs_info *fs_info,
struct btrfs_ioctl_dev_replace_args *args); struct btrfs_ioctl_dev_replace_args *args);
int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info, char *tgtdev_name, int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
u64 srcdevid, char *srcdev_name, int read_src); const char *tgtdev_name, u64 srcdevid, const char *srcdev_name,
int read_src);
void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info, void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info,
struct btrfs_ioctl_dev_replace_args *args); struct btrfs_ioctl_dev_replace_args *args);
int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info, int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info,

9
fs/btrfs/dir-item.c
View File

@ -80,7 +80,8 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans,
struct extent_buffer *leaf; struct extent_buffer *leaf;
u32 data_size; u32 data_size;
BUG_ON(name_len + data_len > BTRFS_MAX_XATTR_SIZE(root->fs_info)); if (name_len + data_len > BTRFS_MAX_XATTR_SIZE(root->fs_info))
return -ENOSPC;
key.objectid = objectid; key.objectid = objectid;
key.type = BTRFS_XATTR_ITEM_KEY; key.type = BTRFS_XATTR_ITEM_KEY;
@ -120,7 +121,7 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans,
*/ */
int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
*root, const char *name, int name_len, *root, const char *name, int name_len,
struct inode *dir, struct btrfs_key *location, struct btrfs_inode *dir, struct btrfs_key *location,
u8 type, u64 index) u8 type, u64 index)
{ {
int ret = 0; int ret = 0;
@ -133,7 +134,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
struct btrfs_disk_key disk_key; struct btrfs_disk_key disk_key;
u32 data_size; u32 data_size;
key.objectid = btrfs_ino(BTRFS_I(dir)); key.objectid = btrfs_ino(dir);
key.type = BTRFS_DIR_ITEM_KEY; key.type = BTRFS_DIR_ITEM_KEY;
key.offset = btrfs_name_hash(name, name_len); key.offset = btrfs_name_hash(name, name_len);
@ -174,7 +175,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_release_path(path); btrfs_release_path(path);
ret2 = btrfs_insert_delayed_dir_index(trans, root->fs_info, name, ret2 = btrfs_insert_delayed_dir_index(trans, root->fs_info, name,
name_len, BTRFS_I(dir), &disk_key, type, index); name_len, dir, &disk_key, type, index);
out_free: out_free:
btrfs_free_path(path); btrfs_free_path(path);
if (ret) if (ret)

17
fs/btrfs/disk-io.c
View File

@ -219,12 +219,12 @@ void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb,
* extents on the btree inode are pretty simple, there's one extent * extents on the btree inode are pretty simple, there's one extent
* that covers the entire device * that covers the entire device
*/ */
static struct extent_map *btree_get_extent(struct inode *inode, static struct extent_map *btree_get_extent(struct btrfs_inode *inode,
struct page *page, size_t pg_offset, u64 start, u64 len, struct page *page, size_t pg_offset, u64 start, u64 len,
int create) int create)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree; struct extent_map_tree *em_tree = &inode->extent_tree;
struct extent_map *em; struct extent_map *em;
int ret; int ret;
@ -265,7 +265,7 @@ static struct extent_map *btree_get_extent(struct inode *inode,
return em; return em;
} }
u32 btrfs_csum_data(char *data, u32 seed, size_t len) u32 btrfs_csum_data(const char *data, u32 seed, size_t len)
{ {
return btrfs_crc32c(seed, data, len); return btrfs_crc32c(seed, data, len);
} }
@ -3453,7 +3453,7 @@ static int write_dev_supers(struct btrfs_device *device,
btrfs_set_super_bytenr(sb, bytenr); btrfs_set_super_bytenr(sb, bytenr);
crc = ~(u32)0; crc = ~(u32)0;
crc = btrfs_csum_data((char *)sb + crc = btrfs_csum_data((const char *)sb +
BTRFS_CSUM_SIZE, crc, BTRFS_CSUM_SIZE, crc,
BTRFS_SUPER_INFO_SIZE - BTRFS_SUPER_INFO_SIZE -
BTRFS_CSUM_SIZE); BTRFS_CSUM_SIZE);
@ -4658,9 +4658,12 @@ static int btrfs_cleanup_transaction(struct btrfs_fs_info *fs_info)
} }
static const struct extent_io_ops btree_extent_io_ops = { static const struct extent_io_ops btree_extent_io_ops = {
.readpage_end_io_hook = btree_readpage_end_io_hook, /* mandatory callbacks */
.readpage_io_failed_hook = btree_io_failed_hook,
.submit_bio_hook = btree_submit_bio_hook, .submit_bio_hook = btree_submit_bio_hook,
.readpage_end_io_hook = btree_readpage_end_io_hook,
/* note we're sharing with inode.c for the merge bio hook */ /* note we're sharing with inode.c for the merge bio hook */
.merge_bio_hook = btrfs_merge_bio_hook, .merge_bio_hook = btrfs_merge_bio_hook,
.readpage_io_failed_hook = btree_io_failed_hook,
/* optional callbacks */
}; };

2
fs/btrfs/disk-io.h
View File

@ -116,7 +116,7 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf);
int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid, int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid,
int atomic); int atomic);
int btrfs_read_buffer(struct extent_buffer *buf, u64 parent_transid); int btrfs_read_buffer(struct extent_buffer *buf, u64 parent_transid);
u32 btrfs_csum_data(char *data, u32 seed, size_t len); u32 btrfs_csum_data(const char *data, u32 seed, size_t len);
void btrfs_csum_final(u32 crc, u8 *result); void btrfs_csum_final(u32 crc, u8 *result);
int btrfs_bio_wq_end_io(struct btrfs_fs_info *info, struct bio *bio, int btrfs_bio_wq_end_io(struct btrfs_fs_info *info, struct bio *bio,
enum btrfs_wq_endio_type metadata); enum btrfs_wq_endio_type metadata);

135
fs/btrfs/extent-tree.c
View File

@ -4135,10 +4135,10 @@ static u64 btrfs_space_info_used(struct btrfs_space_info *s_info,
(may_use_included ? s_info->bytes_may_use : 0); (may_use_included ? s_info->bytes_may_use : 0);
} }
int btrfs_alloc_data_chunk_ondemand(struct inode *inode, u64 bytes) int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes)
{ {
struct btrfs_space_info *data_sinfo; struct btrfs_space_info *data_sinfo;
struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_root *root = inode->root;
struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_fs_info *fs_info = root->fs_info;
u64 used; u64 used;
int ret = 0; int ret = 0;
@ -4281,7 +4281,7 @@ int btrfs_check_data_free_space(struct inode *inode, u64 start, u64 len)
round_down(start, fs_info->sectorsize); round_down(start, fs_info->sectorsize);
start = round_down(start, fs_info->sectorsize); start = round_down(start, fs_info->sectorsize);
ret = btrfs_alloc_data_chunk_ondemand(inode, len); ret = btrfs_alloc_data_chunk_ondemand(BTRFS_I(inode), len);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -5742,10 +5742,10 @@ void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans)
/* Can only return 0 or -ENOSPC */ /* Can only return 0 or -ENOSPC */
int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans, int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans,
struct inode *inode) struct btrfs_inode *inode)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_root *root = inode->root;
/* /*
* We always use trans->block_rsv here as we will have reserved space * We always use trans->block_rsv here as we will have reserved space
* for our orphan when starting the transaction, using get_block_rsv() * for our orphan when starting the transaction, using get_block_rsv()
@ -5762,19 +5762,19 @@ int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans,
*/ */
u64 num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1); u64 num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);
trace_btrfs_space_reservation(fs_info, "orphan", trace_btrfs_space_reservation(fs_info, "orphan", btrfs_ino(inode),
btrfs_ino(BTRFS_I(inode)), num_bytes, 1); num_bytes, 1);
return btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, 1); return btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, 1);
} }
void btrfs_orphan_release_metadata(struct inode *inode) void btrfs_orphan_release_metadata(struct btrfs_inode *inode)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_root *root = inode->root;
u64 num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1); u64 num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);
trace_btrfs_space_reservation(fs_info, "orphan", trace_btrfs_space_reservation(fs_info, "orphan", btrfs_ino(inode),
btrfs_ino(BTRFS_I(inode)), num_bytes, 0); num_bytes, 0);
btrfs_block_rsv_release(fs_info, root->orphan_block_rsv, num_bytes); btrfs_block_rsv_release(fs_info, root->orphan_block_rsv, num_bytes);
} }
@ -5846,7 +5846,8 @@ void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info,
* reserved extents that need to be freed. This must be called with * reserved extents that need to be freed. This must be called with
* BTRFS_I(inode)->lock held. * BTRFS_I(inode)->lock held.
*/ */
static unsigned drop_outstanding_extent(struct inode *inode, u64 num_bytes) static unsigned drop_outstanding_extent(struct btrfs_inode *inode,
u64 num_bytes)
{ {
unsigned drop_inode_space = 0; unsigned drop_inode_space = 0;
unsigned dropped_extents = 0; unsigned dropped_extents = 0;
@ -5854,25 +5855,23 @@ static unsigned drop_outstanding_extent(struct inode *inode, u64 num_bytes)
num_extents = count_max_extents(num_bytes); num_extents = count_max_extents(num_bytes);
ASSERT(num_extents); ASSERT(num_extents);
ASSERT(BTRFS_I(inode)->outstanding_extents >= num_extents); ASSERT(inode->outstanding_extents >= num_extents);
BTRFS_I(inode)->outstanding_extents -= num_extents; inode->outstanding_extents -= num_extents;
if (BTRFS_I(inode)->outstanding_extents == 0 && if (inode->outstanding_extents == 0 &&
test_and_clear_bit(BTRFS_INODE_DELALLOC_META_RESERVED, test_and_clear_bit(BTRFS_INODE_DELALLOC_META_RESERVED,
&BTRFS_I(inode)->runtime_flags)) &inode->runtime_flags))
drop_inode_space = 1; drop_inode_space = 1;
/* /*
* If we have more or the same amount of outstanding extents than we have * If we have more or the same amount of outstanding extents than we have
* reserved then we need to leave the reserved extents count alone. * reserved then we need to leave the reserved extents count alone.
*/ */
if (BTRFS_I(inode)->outstanding_extents >= if (inode->outstanding_extents >= inode->reserved_extents)
BTRFS_I(inode)->reserved_extents)
return drop_inode_space; return drop_inode_space;
dropped_extents = BTRFS_I(inode)->reserved_extents - dropped_extents = inode->reserved_extents - inode->outstanding_extents;
BTRFS_I(inode)->outstanding_extents; inode->reserved_extents -= dropped_extents;
BTRFS_I(inode)->reserved_extents -= dropped_extents;
return dropped_extents + drop_inode_space; return dropped_extents + drop_inode_space;
} }
@ -5894,24 +5893,21 @@ static unsigned drop_outstanding_extent(struct inode *inode, u64 num_bytes)
* *
* This must be called with BTRFS_I(inode)->lock held. * This must be called with BTRFS_I(inode)->lock held.
*/ */
static u64 calc_csum_metadata_size(struct inode *inode, u64 num_bytes, static u64 calc_csum_metadata_size(struct btrfs_inode *inode, u64 num_bytes,
int reserve) int reserve)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
u64 old_csums, num_csums; u64 old_csums, num_csums;
if (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM && if (inode->flags & BTRFS_INODE_NODATASUM && inode->csum_bytes == 0)
BTRFS_I(inode)->csum_bytes == 0)
return 0; return 0;
old_csums = btrfs_csum_bytes_to_leaves(fs_info, old_csums = btrfs_csum_bytes_to_leaves(fs_info, inode->csum_bytes);
BTRFS_I(inode)->csum_bytes);
if (reserve) if (reserve)
BTRFS_I(inode)->csum_bytes += num_bytes; inode->csum_bytes += num_bytes;
else else
BTRFS_I(inode)->csum_bytes -= num_bytes; inode->csum_bytes -= num_bytes;
num_csums = btrfs_csum_bytes_to_leaves(fs_info, num_csums = btrfs_csum_bytes_to_leaves(fs_info, inode->csum_bytes);
BTRFS_I(inode)->csum_bytes);
/* No change, no need to reserve more */ /* No change, no need to reserve more */
if (old_csums == num_csums) if (old_csums == num_csums)
@ -5924,10 +5920,10 @@ static u64 calc_csum_metadata_size(struct inode *inode, u64 num_bytes,
return btrfs_calc_trans_metadata_size(fs_info, old_csums - num_csums); return btrfs_calc_trans_metadata_size(fs_info, old_csums - num_csums);
} }
int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes) int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_root *root = inode->root;
struct btrfs_block_rsv *block_rsv = &fs_info->delalloc_block_rsv; struct btrfs_block_rsv *block_rsv = &fs_info->delalloc_block_rsv;
u64 to_reserve = 0; u64 to_reserve = 0;
u64 csum_bytes; u64 csum_bytes;
@ -5959,25 +5955,24 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
schedule_timeout(1); schedule_timeout(1);
if (delalloc_lock) if (delalloc_lock)
mutex_lock(&BTRFS_I(inode)->delalloc_mutex); mutex_lock(&inode->delalloc_mutex);
num_bytes = ALIGN(num_bytes, fs_info->sectorsize); num_bytes = ALIGN(num_bytes, fs_info->sectorsize);
spin_lock(&BTRFS_I(inode)->lock); spin_lock(&inode->lock);
nr_extents = count_max_extents(num_bytes); nr_extents = count_max_extents(num_bytes);
BTRFS_I(inode)->outstanding_extents += nr_extents; inode->outstanding_extents += nr_extents;
nr_extents = 0; nr_extents = 0;
if (BTRFS_I(inode)->outstanding_extents > if (inode->outstanding_extents > inode->reserved_extents)
BTRFS_I(inode)->reserved_extents) nr_extents += inode->outstanding_extents -
nr_extents += BTRFS_I(inode)->outstanding_extents - inode->reserved_extents;
BTRFS_I(inode)->reserved_extents;
/* We always want to reserve a slot for updating the inode. */ /* We always want to reserve a slot for updating the inode. */
to_reserve = btrfs_calc_trans_metadata_size(fs_info, nr_extents + 1); to_reserve = btrfs_calc_trans_metadata_size(fs_info, nr_extents + 1);
to_reserve += calc_csum_metadata_size(inode, num_bytes, 1); to_reserve += calc_csum_metadata_size(inode, num_bytes, 1);
csum_bytes = BTRFS_I(inode)->csum_bytes; csum_bytes = inode->csum_bytes;
spin_unlock(&BTRFS_I(inode)->lock); spin_unlock(&inode->lock);
if (test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags)) { if (test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags)) {
ret = btrfs_qgroup_reserve_meta(root, ret = btrfs_qgroup_reserve_meta(root,
@ -5993,38 +5988,38 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
goto out_fail; goto out_fail;
} }
spin_lock(&BTRFS_I(inode)->lock); spin_lock(&inode->lock);
if (test_and_set_bit(BTRFS_INODE_DELALLOC_META_RESERVED, if (test_and_set_bit(BTRFS_INODE_DELALLOC_META_RESERVED,
&BTRFS_I(inode)->runtime_flags)) { &inode->runtime_flags)) {
to_reserve -= btrfs_calc_trans_metadata_size(fs_info, 1); to_reserve -= btrfs_calc_trans_metadata_size(fs_info, 1);
release_extra = true; release_extra = true;
} }
BTRFS_I(inode)->reserved_extents += nr_extents; inode->reserved_extents += nr_extents;
spin_unlock(&BTRFS_I(inode)->lock); spin_unlock(&inode->lock);
if (delalloc_lock) if (delalloc_lock)
mutex_unlock(&BTRFS_I(inode)->delalloc_mutex); mutex_unlock(&inode->delalloc_mutex);
if (to_reserve) if (to_reserve)
trace_btrfs_space_reservation(fs_info, "delalloc", trace_btrfs_space_reservation(fs_info, "delalloc",
btrfs_ino(BTRFS_I(inode)), to_reserve, 1); btrfs_ino(inode), to_reserve, 1);
if (release_extra) if (release_extra)
btrfs_block_rsv_release(fs_info, block_rsv, btrfs_block_rsv_release(fs_info, block_rsv,
btrfs_calc_trans_metadata_size(fs_info, 1)); btrfs_calc_trans_metadata_size(fs_info, 1));
return 0; return 0;
out_fail: out_fail:
spin_lock(&BTRFS_I(inode)->lock); spin_lock(&inode->lock);
dropped = drop_outstanding_extent(inode, num_bytes); dropped = drop_outstanding_extent(inode, num_bytes);
/* /*
* If the inodes csum_bytes is the same as the original * If the inodes csum_bytes is the same as the original
* csum_bytes then we know we haven't raced with any free()ers * csum_bytes then we know we haven't raced with any free()ers
* so we can just reduce our inodes csum bytes and carry on. * so we can just reduce our inodes csum bytes and carry on.
*/ */
if (BTRFS_I(inode)->csum_bytes == csum_bytes) { if (inode->csum_bytes == csum_bytes) {
calc_csum_metadata_size(inode, num_bytes, 0); calc_csum_metadata_size(inode, num_bytes, 0);
} else { } else {
u64 orig_csum_bytes = BTRFS_I(inode)->csum_bytes; u64 orig_csum_bytes = inode->csum_bytes;
u64 bytes; u64 bytes;
/* /*
@ -6035,8 +6030,8 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
* number of bytes that were freed while we were trying our * number of bytes that were freed while we were trying our
* reservation. * reservation.
*/ */
bytes = csum_bytes - BTRFS_I(inode)->csum_bytes; bytes = csum_bytes - inode->csum_bytes;
BTRFS_I(inode)->csum_bytes = csum_bytes; inode->csum_bytes = csum_bytes;
to_free = calc_csum_metadata_size(inode, bytes, 0); to_free = calc_csum_metadata_size(inode, bytes, 0);
@ -6045,7 +6040,7 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
* been making this reservation and our ->csum_bytes were not * been making this reservation and our ->csum_bytes were not
* artificially inflated. * artificially inflated.
*/ */
BTRFS_I(inode)->csum_bytes = csum_bytes - num_bytes; inode->csum_bytes = csum_bytes - num_bytes;
bytes = csum_bytes - orig_csum_bytes; bytes = csum_bytes - orig_csum_bytes;
bytes = calc_csum_metadata_size(inode, bytes, 0); bytes = calc_csum_metadata_size(inode, bytes, 0);
@ -6057,23 +6052,23 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
* need to do anything, the other free-ers did the correct * need to do anything, the other free-ers did the correct
* thing. * thing.
*/ */
BTRFS_I(inode)->csum_bytes = orig_csum_bytes - num_bytes; inode->csum_bytes = orig_csum_bytes - num_bytes;
if (bytes > to_free) if (bytes > to_free)
to_free = bytes - to_free; to_free = bytes - to_free;
else else
to_free = 0; to_free = 0;
} }
spin_unlock(&BTRFS_I(inode)->lock); spin_unlock(&inode->lock);
if (dropped) if (dropped)
to_free += btrfs_calc_trans_metadata_size(fs_info, dropped); to_free += btrfs_calc_trans_metadata_size(fs_info, dropped);
if (to_free) { if (to_free) {
btrfs_block_rsv_release(fs_info, block_rsv, to_free); btrfs_block_rsv_release(fs_info, block_rsv, to_free);
trace_btrfs_space_reservation(fs_info, "delalloc", trace_btrfs_space_reservation(fs_info, "delalloc",
btrfs_ino(BTRFS_I(inode)), to_free, 0); btrfs_ino(inode), to_free, 0);
} }
if (delalloc_lock) if (delalloc_lock)
mutex_unlock(&BTRFS_I(inode)->delalloc_mutex); mutex_unlock(&inode->delalloc_mutex);
return ret; return ret;
} }
@ -6086,27 +6081,27 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
* once we complete IO for a given set of bytes to release their metadata * once we complete IO for a given set of bytes to release their metadata
* reservations. * reservations.
*/ */
void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes) void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
u64 to_free = 0; u64 to_free = 0;
unsigned dropped; unsigned dropped;
num_bytes = ALIGN(num_bytes, fs_info->sectorsize); num_bytes = ALIGN(num_bytes, fs_info->sectorsize);
spin_lock(&BTRFS_I(inode)->lock); spin_lock(&inode->lock);
dropped = drop_outstanding_extent(inode, num_bytes); dropped = drop_outstanding_extent(inode, num_bytes);
if (num_bytes) if (num_bytes)
to_free = calc_csum_metadata_size(inode, num_bytes, 0); to_free = calc_csum_metadata_size(inode, num_bytes, 0);
spin_unlock(&BTRFS_I(inode)->lock); spin_unlock(&inode->lock);
if (dropped > 0) if (dropped > 0)
to_free += btrfs_calc_trans_metadata_size(fs_info, dropped); to_free += btrfs_calc_trans_metadata_size(fs_info, dropped);
if (btrfs_is_testing(fs_info)) if (btrfs_is_testing(fs_info))
return; return;
trace_btrfs_space_reservation(fs_info, "delalloc", trace_btrfs_space_reservation(fs_info, "delalloc", btrfs_ino(inode),
btrfs_ino(BTRFS_I(inode)), to_free, 0); to_free, 0);
btrfs_block_rsv_release(fs_info, &fs_info->delalloc_block_rsv, to_free); btrfs_block_rsv_release(fs_info, &fs_info->delalloc_block_rsv, to_free);
} }
@ -6141,7 +6136,7 @@ int btrfs_delalloc_reserve_space(struct inode *inode, u64 start, u64 len)
ret = btrfs_check_data_free_space(inode, start, len); ret = btrfs_check_data_free_space(inode, start, len);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = btrfs_delalloc_reserve_metadata(inode, len); ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode), len);
if (ret < 0) if (ret < 0)
btrfs_free_reserved_data_space(inode, start, len); btrfs_free_reserved_data_space(inode, start, len);
return ret; return ret;
@ -6164,7 +6159,7 @@ int btrfs_delalloc_reserve_space(struct inode *inode, u64 start, u64 len)
*/ */
void btrfs_delalloc_release_space(struct inode *inode, u64 start, u64 len) void btrfs_delalloc_release_space(struct inode *inode, u64 start, u64 len)
{ {
btrfs_delalloc_release_metadata(inode, len); btrfs_delalloc_release_metadata(BTRFS_I(inode), len);
btrfs_free_reserved_data_space(inode, start, len); btrfs_free_reserved_data_space(inode, start, len);
} }
@ -10345,7 +10340,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
mutex_unlock(&trans->transaction->cache_write_mutex); mutex_unlock(&trans->transaction->cache_write_mutex);
if (!IS_ERR(inode)) { if (!IS_ERR(inode)) {
ret = btrfs_orphan_add(trans, inode); ret = btrfs_orphan_add(trans, BTRFS_I(inode));
if (ret) { if (ret) {
btrfs_add_delayed_iput(inode); btrfs_add_delayed_iput(inode);
goto out; goto out;

75
fs/btrfs/extent_io.c
View File

@ -428,7 +428,8 @@ static void clear_state_cb(struct extent_io_tree *tree,
struct extent_state *state, unsigned *bits) struct extent_state *state, unsigned *bits)
{ {
if (tree->ops && tree->ops->clear_bit_hook) if (tree->ops && tree->ops->clear_bit_hook)
tree->ops->clear_bit_hook(tree->mapping->host, state, bits); tree->ops->clear_bit_hook(BTRFS_I(tree->mapping->host),
state, bits);
} }
static void set_state_bits(struct extent_io_tree *tree, static void set_state_bits(struct extent_io_tree *tree,
@ -1959,11 +1960,11 @@ static void check_page_uptodate(struct extent_io_tree *tree, struct page *page)
SetPageUptodate(page); SetPageUptodate(page);
} }
int free_io_failure(struct inode *inode, struct io_failure_record *rec) int free_io_failure(struct btrfs_inode *inode, struct io_failure_record *rec)
{ {
int ret; int ret;
int err = 0; int err = 0;
struct extent_io_tree *failure_tree = &BTRFS_I(inode)->io_failure_tree; struct extent_io_tree *failure_tree = &inode->io_failure_tree;
set_state_failrec(failure_tree, rec->start, NULL); set_state_failrec(failure_tree, rec->start, NULL);
ret = clear_extent_bits(failure_tree, rec->start, ret = clear_extent_bits(failure_tree, rec->start,
@ -1972,7 +1973,7 @@ int free_io_failure(struct inode *inode, struct io_failure_record *rec)
if (ret) if (ret)
err = ret; err = ret;
ret = clear_extent_bits(&BTRFS_I(inode)->io_tree, rec->start, ret = clear_extent_bits(&inode->io_tree, rec->start,
rec->start + rec->len - 1, rec->start + rec->len - 1,
EXTENT_DAMAGED); EXTENT_DAMAGED);
if (ret && !err) if (ret && !err)
@ -1992,10 +1993,11 @@ int free_io_failure(struct inode *inode, struct io_failure_record *rec)
* currently, there can be no more than two copies of every data bit. thus, * currently, there can be no more than two copies of every data bit. thus,
* exactly one rewrite is required. * exactly one rewrite is required.
*/ */
int repair_io_failure(struct inode *inode, u64 start, u64 length, u64 logical, int repair_io_failure(struct btrfs_inode *inode, u64 start, u64 length,
struct page *page, unsigned int pg_offset, int mirror_num) u64 logical, struct page *page,
unsigned int pg_offset, int mirror_num)
{ {
struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info; struct btrfs_fs_info *fs_info = inode->root->fs_info;
struct bio *bio; struct bio *bio;
struct btrfs_device *dev; struct btrfs_device *dev;
u64 map_length = 0; u64 map_length = 0;
@ -2054,7 +2056,7 @@ int repair_io_failure(struct inode *inode, u64 start, u64 length, u64 logical,
btrfs_info_rl_in_rcu(fs_info, btrfs_info_rl_in_rcu(fs_info,
"read error corrected: ino %llu off %llu (dev %s sector %llu)", "read error corrected: ino %llu off %llu (dev %s sector %llu)",
btrfs_ino(BTRFS_I(inode)), start, btrfs_ino(inode), start,
rcu_str_deref(dev->name), sector); rcu_str_deref(dev->name), sector);
btrfs_bio_counter_dec(fs_info); btrfs_bio_counter_dec(fs_info);
bio_put(bio); bio_put(bio);
@ -2074,7 +2076,7 @@ int repair_eb_io_failure(struct btrfs_fs_info *fs_info,
for (i = 0; i < num_pages; i++) { for (i = 0; i < num_pages; i++) {
struct page *p = eb->pages[i]; struct page *p = eb->pages[i];
ret = repair_io_failure(fs_info->btree_inode, start, ret = repair_io_failure(BTRFS_I(fs_info->btree_inode), start,
PAGE_SIZE, start, p, PAGE_SIZE, start, p,
start - page_offset(p), mirror_num); start - page_offset(p), mirror_num);
if (ret) if (ret)
@ -2089,23 +2091,23 @@ int repair_eb_io_failure(struct btrfs_fs_info *fs_info,
* each time an IO finishes, we do a fast check in the IO failure tree * each time an IO finishes, we do a fast check in the IO failure tree
* to see if we need to process or clean up an io_failure_record * to see if we need to process or clean up an io_failure_record
*/ */
int clean_io_failure(struct inode *inode, u64 start, struct page *page, int clean_io_failure(struct btrfs_inode *inode, u64 start, struct page *page,
unsigned int pg_offset) unsigned int pg_offset)
{ {
u64 private; u64 private;
struct io_failure_record *failrec; struct io_failure_record *failrec;
struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info; struct btrfs_fs_info *fs_info = inode->root->fs_info;
struct extent_state *state; struct extent_state *state;
int num_copies; int num_copies;
int ret; int ret;
private = 0; private = 0;
ret = count_range_bits(&BTRFS_I(inode)->io_failure_tree, &private, ret = count_range_bits(&inode->io_failure_tree, &private,
(u64)-1, 1, EXTENT_DIRTY, 0); (u64)-1, 1, EXTENT_DIRTY, 0);
if (!ret) if (!ret)
return 0; return 0;
ret = get_state_failrec(&BTRFS_I(inode)->io_failure_tree, start, ret = get_state_failrec(&inode->io_failure_tree, start,
&failrec); &failrec);
if (ret) if (ret)
return 0; return 0;
@ -2122,11 +2124,11 @@ int clean_io_failure(struct inode *inode, u64 start, struct page *page,
if (fs_info->sb->s_flags & MS_RDONLY) if (fs_info->sb->s_flags & MS_RDONLY)
goto out; goto out;
spin_lock(&BTRFS_I(inode)->io_tree.lock); spin_lock(&inode->io_tree.lock);
state = find_first_extent_bit_state(&BTRFS_I(inode)->io_tree, state = find_first_extent_bit_state(&inode->io_tree,
failrec->start, failrec->start,
EXTENT_LOCKED); EXTENT_LOCKED);
spin_unlock(&BTRFS_I(inode)->io_tree.lock); spin_unlock(&inode->io_tree.lock);
if (state && state->start <= failrec->start && if (state && state->start <= failrec->start &&
state->end >= failrec->start + failrec->len - 1) { state->end >= failrec->start + failrec->len - 1) {
@ -2151,9 +2153,9 @@ int clean_io_failure(struct inode *inode, u64 start, struct page *page,
* - under ordered extent * - under ordered extent
* - the inode is freeing * - the inode is freeing
*/ */
void btrfs_free_io_failure_record(struct inode *inode, u64 start, u64 end) void btrfs_free_io_failure_record(struct btrfs_inode *inode, u64 start, u64 end)
{ {
struct extent_io_tree *failure_tree = &BTRFS_I(inode)->io_failure_tree; struct extent_io_tree *failure_tree = &inode->io_failure_tree;
struct io_failure_record *failrec; struct io_failure_record *failrec;
struct extent_state *state, *next; struct extent_state *state, *next;
@ -2393,7 +2395,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,
ret = btrfs_check_repairable(inode, failed_bio, failrec, failed_mirror); ret = btrfs_check_repairable(inode, failed_bio, failrec, failed_mirror);
if (!ret) { if (!ret) {
free_io_failure(inode, failrec); free_io_failure(BTRFS_I(inode), failrec);
return -EIO; return -EIO;
} }
@ -2406,7 +2408,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,
(int)phy_offset, failed_bio->bi_end_io, (int)phy_offset, failed_bio->bi_end_io,
NULL); NULL);
if (!bio) { if (!bio) {
free_io_failure(inode, failrec); free_io_failure(BTRFS_I(inode), failrec);
return -EIO; return -EIO;
} }
bio_set_op_attrs(bio, REQ_OP_READ, read_mode); bio_set_op_attrs(bio, REQ_OP_READ, read_mode);
@ -2418,7 +2420,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,
ret = tree->ops->submit_bio_hook(inode, bio, failrec->this_mirror, ret = tree->ops->submit_bio_hook(inode, bio, failrec->this_mirror,
failrec->bio_flags, 0); failrec->bio_flags, 0);
if (ret) { if (ret) {
free_io_failure(inode, failrec); free_io_failure(BTRFS_I(inode), failrec);
bio_put(bio); bio_put(bio);
} }
@ -2435,12 +2437,9 @@ void end_extent_writepage(struct page *page, int err, u64 start, u64 end)
tree = &BTRFS_I(page->mapping->host)->io_tree; tree = &BTRFS_I(page->mapping->host)->io_tree;
if (tree->ops && tree->ops->writepage_end_io_hook) { if (tree->ops && tree->ops->writepage_end_io_hook)
ret = tree->ops->writepage_end_io_hook(page, start, tree->ops->writepage_end_io_hook(page, start, end, NULL,
end, NULL, uptodate); uptodate);
if (ret)
uptodate = 0;
}
if (!uptodate) { if (!uptodate) {
ClearPageUptodate(page); ClearPageUptodate(page);
@ -2568,21 +2567,21 @@ static void end_bio_extent_readpage(struct bio *bio)
len = bvec->bv_len; len = bvec->bv_len;
mirror = io_bio->mirror_num; mirror = io_bio->mirror_num;
if (likely(uptodate && tree->ops && if (likely(uptodate && tree->ops)) {
tree->ops->readpage_end_io_hook)) {
ret = tree->ops->readpage_end_io_hook(io_bio, offset, ret = tree->ops->readpage_end_io_hook(io_bio, offset,
page, start, end, page, start, end,
mirror); mirror);
if (ret) if (ret)
uptodate = 0; uptodate = 0;
else else
clean_io_failure(inode, start, page, 0); clean_io_failure(BTRFS_I(inode), start,
page, 0);
} }
if (likely(uptodate)) if (likely(uptodate))
goto readpage_ok; goto readpage_ok;
if (tree->ops && tree->ops->readpage_io_failed_hook) { if (tree->ops) {
ret = tree->ops->readpage_io_failed_hook(page, mirror); ret = tree->ops->readpage_io_failed_hook(page, mirror);
if (!ret && !bio->bi_error) if (!ret && !bio->bi_error)
uptodate = 1; uptodate = 1;
@ -2731,7 +2730,7 @@ static int __must_check submit_one_bio(struct bio *bio, int mirror_num,
bio->bi_private = NULL; bio->bi_private = NULL;
bio_get(bio); bio_get(bio);
if (tree->ops && tree->ops->submit_bio_hook) if (tree->ops)
ret = tree->ops->submit_bio_hook(page->mapping->host, bio, ret = tree->ops->submit_bio_hook(page->mapping->host, bio,
mirror_num, bio_flags, start); mirror_num, bio_flags, start);
else else
@ -2746,7 +2745,7 @@ static int merge_bio(struct extent_io_tree *tree, struct page *page,
unsigned long bio_flags) unsigned long bio_flags)
{ {
int ret = 0; int ret = 0;
if (tree->ops && tree->ops->merge_bio_hook) if (tree->ops)
ret = tree->ops->merge_bio_hook(page, offset, size, bio, ret = tree->ops->merge_bio_hook(page, offset, size, bio,
bio_flags); bio_flags);
return ret; return ret;
@ -2857,7 +2856,7 @@ __get_extent_map(struct inode *inode, struct page *page, size_t pg_offset,
*em_cached = NULL; *em_cached = NULL;
} }
em = get_extent(inode, page, pg_offset, start, len, 0); em = get_extent(BTRFS_I(inode), page, pg_offset, start, len, 0);
if (em_cached && !IS_ERR_OR_NULL(em)) { if (em_cached && !IS_ERR_OR_NULL(em)) {
BUG_ON(*em_cached); BUG_ON(*em_cached);
atomic_inc(&em->refs); atomic_inc(&em->refs);
@ -3101,7 +3100,7 @@ static inline void __do_contiguous_readpages(struct extent_io_tree *tree,
inode = pages[0]->mapping->host; inode = pages[0]->mapping->host;
while (1) { while (1) {
lock_extent(tree, start, end); lock_extent(tree, start, end);
ordered = btrfs_lookup_ordered_range(inode, start, ordered = btrfs_lookup_ordered_range(BTRFS_I(inode), start,
end - start + 1); end - start + 1);
if (!ordered) if (!ordered)
break; break;
@ -3173,7 +3172,7 @@ static int __extent_read_full_page(struct extent_io_tree *tree,
while (1) { while (1) {
lock_extent(tree, start, end); lock_extent(tree, start, end);
ordered = btrfs_lookup_ordered_range(inode, start, ordered = btrfs_lookup_ordered_range(BTRFS_I(inode), start,
PAGE_SIZE); PAGE_SIZE);
if (!ordered) if (!ordered)
break; break;
@ -3370,7 +3369,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
page_end, NULL, 1); page_end, NULL, 1);
break; break;
} }
em = epd->get_extent(inode, page, pg_offset, cur, em = epd->get_extent(BTRFS_I(inode), page, pg_offset, cur,
end - cur + 1, 1); end - cur + 1, 1);
if (IS_ERR_OR_NULL(em)) { if (IS_ERR_OR_NULL(em)) {
SetPageError(page); SetPageError(page);
@ -4335,7 +4334,7 @@ static struct extent_map *get_extent_skip_holes(struct inode *inode,
if (len == 0) if (len == 0)
break; break;
len = ALIGN(len, sectorsize); len = ALIGN(len, sectorsize);
em = get_extent(inode, NULL, 0, offset, len, 0); em = get_extent(BTRFS_I(inode), NULL, 0, offset, len, 0);
if (IS_ERR_OR_NULL(em)) if (IS_ERR_OR_NULL(em))
return em; return em;

50
fs/btrfs/extent_io.h
View File

@ -84,6 +84,7 @@ extern void le_bitmap_clear(u8 *map, unsigned int start, int len);
struct extent_state; struct extent_state;
struct btrfs_root; struct btrfs_root;
struct btrfs_inode;
struct btrfs_io_bio; struct btrfs_io_bio;
struct io_failure_record; struct io_failure_record;
@ -91,24 +92,34 @@ typedef int (extent_submit_bio_hook_t)(struct inode *inode, struct bio *bio,
int mirror_num, unsigned long bio_flags, int mirror_num, unsigned long bio_flags,
u64 bio_offset); u64 bio_offset);
struct extent_io_ops { struct extent_io_ops {
int (*fill_delalloc)(struct inode *inode, struct page *locked_page, /*
u64 start, u64 end, int *page_started, * The following callbacks must be allways defined, the function
unsigned long *nr_written); * pointer will be called unconditionally.
int (*writepage_start_hook)(struct page *page, u64 start, u64 end); */
extent_submit_bio_hook_t *submit_bio_hook; extent_submit_bio_hook_t *submit_bio_hook;
int (*readpage_end_io_hook)(struct btrfs_io_bio *io_bio, u64 phy_offset,
struct page *page, u64 start, u64 end,
int mirror);
int (*merge_bio_hook)(struct page *page, unsigned long offset, int (*merge_bio_hook)(struct page *page, unsigned long offset,
size_t size, struct bio *bio, size_t size, struct bio *bio,
unsigned long bio_flags); unsigned long bio_flags);
int (*readpage_io_failed_hook)(struct page *page, int failed_mirror); int (*readpage_io_failed_hook)(struct page *page, int failed_mirror);
int (*readpage_end_io_hook)(struct btrfs_io_bio *io_bio, u64 phy_offset,
struct page *page, u64 start, u64 end, /*
int mirror); * Optional hooks, called if the pointer is not NULL
int (*writepage_end_io_hook)(struct page *page, u64 start, u64 end, */
int (*fill_delalloc)(struct inode *inode, struct page *locked_page,
u64 start, u64 end, int *page_started,
unsigned long *nr_written);
int (*writepage_start_hook)(struct page *page, u64 start, u64 end);
void (*writepage_end_io_hook)(struct page *page, u64 start, u64 end,
struct extent_state *state, int uptodate); struct extent_state *state, int uptodate);
void (*set_bit_hook)(struct inode *inode, struct extent_state *state, void (*set_bit_hook)(struct inode *inode, struct extent_state *state,
unsigned *bits); unsigned *bits);
void (*clear_bit_hook)(struct inode *inode, struct extent_state *state, void (*clear_bit_hook)(struct btrfs_inode *inode,
unsigned *bits); struct extent_state *state,
unsigned *bits);
void (*merge_extent_hook)(struct inode *inode, void (*merge_extent_hook)(struct inode *inode,
struct extent_state *new, struct extent_state *new,
struct extent_state *other); struct extent_state *other);
@ -209,7 +220,7 @@ static inline int extent_compress_type(unsigned long bio_flags)
struct extent_map_tree; struct extent_map_tree;
typedef struct extent_map *(get_extent_t)(struct inode *inode, typedef struct extent_map *(get_extent_t)(struct btrfs_inode *inode,
struct page *page, struct page *page,
size_t pg_offset, size_t pg_offset,
u64 start, u64 len, u64 start, u64 len,
@ -451,12 +462,13 @@ struct bio *btrfs_io_bio_alloc(gfp_t gfp_mask, unsigned int nr_iovecs);
struct bio *btrfs_bio_clone(struct bio *bio, gfp_t gfp_mask); struct bio *btrfs_bio_clone(struct bio *bio, gfp_t gfp_mask);
struct btrfs_fs_info; struct btrfs_fs_info;
struct btrfs_inode;
int repair_io_failure(struct inode *inode, u64 start, u64 length, u64 logical, int repair_io_failure(struct btrfs_inode *inode, u64 start, u64 length,
struct page *page, unsigned int pg_offset, u64 logical, struct page *page,
int mirror_num); unsigned int pg_offset, int mirror_num);
int clean_io_failure(struct inode *inode, u64 start, struct page *page, int clean_io_failure(struct btrfs_inode *inode, u64 start,
unsigned int pg_offset); struct page *page, unsigned int pg_offset);
void end_extent_writepage(struct page *page, int err, u64 start, u64 end); void end_extent_writepage(struct page *page, int err, u64 start, u64 end);
int repair_eb_io_failure(struct btrfs_fs_info *fs_info, int repair_eb_io_failure(struct btrfs_fs_info *fs_info,
struct extent_buffer *eb, int mirror_num); struct extent_buffer *eb, int mirror_num);
@ -480,7 +492,9 @@ struct io_failure_record {
int in_validation; int in_validation;
}; };
void btrfs_free_io_failure_record(struct inode *inode, u64 start, u64 end);
void btrfs_free_io_failure_record(struct btrfs_inode *inode, u64 start,
u64 end);
int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end, int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end,
struct io_failure_record **failrec_ret); struct io_failure_record **failrec_ret);
int btrfs_check_repairable(struct inode *inode, struct bio *failed_bio, int btrfs_check_repairable(struct inode *inode, struct bio *failed_bio,
@ -489,7 +503,7 @@ struct bio *btrfs_create_repair_bio(struct inode *inode, struct bio *failed_bio,
struct io_failure_record *failrec, struct io_failure_record *failrec,
struct page *page, int pg_offset, int icsum, struct page *page, int pg_offset, int icsum,
bio_end_io_t *endio_func, void *data); bio_end_io_t *endio_func, void *data);
int free_io_failure(struct inode *inode, struct io_failure_record *rec); int free_io_failure(struct btrfs_inode *inode, struct io_failure_record *rec);
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
noinline u64 find_lock_delalloc_range(struct inode *inode, noinline u64 find_lock_delalloc_range(struct inode *inode,
struct extent_io_tree *tree, struct extent_io_tree *tree,

12
fs/btrfs/file-item.c
View File

@ -214,7 +214,7 @@ static int __btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio,
* read from the commit root and sidestep a nasty deadlock * read from the commit root and sidestep a nasty deadlock
* between reading the free space cache and updating the csum tree. * between reading the free space cache and updating the csum tree.
*/ */
if (btrfs_is_free_space_inode(inode)) { if (btrfs_is_free_space_inode(BTRFS_I(inode))) {
path->search_commit_root = 1; path->search_commit_root = 1;
path->skip_locking = 1; path->skip_locking = 1;
} }
@ -930,14 +930,14 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
goto out; goto out;
} }
void btrfs_extent_item_to_extent_map(struct inode *inode, void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode,
const struct btrfs_path *path, const struct btrfs_path *path,
struct btrfs_file_extent_item *fi, struct btrfs_file_extent_item *fi,
const bool new_inline, const bool new_inline,
struct extent_map *em) struct extent_map *em)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_root *root = inode->root;
struct extent_buffer *leaf = path->nodes[0]; struct extent_buffer *leaf = path->nodes[0];
const int slot = path->slots[0]; const int slot = path->slots[0];
struct btrfs_key key; struct btrfs_key key;
@ -1002,8 +1002,8 @@ void btrfs_extent_item_to_extent_map(struct inode *inode,
} }
} else { } else {
btrfs_err(fs_info, btrfs_err(fs_info,
"unknown file extent item type %d, inode %llu, offset %llu, root %llu", "unknown file extent item type %d, inode %llu, offset %llu, "
type, btrfs_ino(BTRFS_I(inode)), extent_start, "root %llu", type, btrfs_ino(inode), extent_start,
root->root_key.objectid); root->root_key.objectid);
} }
} }

139
fs/btrfs/file.c
View File

@ -92,10 +92,10 @@ static int __compare_inode_defrag(struct inode_defrag *defrag1,
* If an existing record is found the defrag item you * If an existing record is found the defrag item you
* pass in is freed * pass in is freed
*/ */
static int __btrfs_add_inode_defrag(struct inode *inode, static int __btrfs_add_inode_defrag(struct btrfs_inode *inode,
struct inode_defrag *defrag) struct inode_defrag *defrag)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
struct inode_defrag *entry; struct inode_defrag *entry;
struct rb_node **p; struct rb_node **p;
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
@ -123,7 +123,7 @@ static int __btrfs_add_inode_defrag(struct inode *inode,
return -EEXIST; return -EEXIST;
} }
} }
set_bit(BTRFS_INODE_IN_DEFRAG, &BTRFS_I(inode)->runtime_flags); set_bit(BTRFS_INODE_IN_DEFRAG, &inode->runtime_flags);
rb_link_node(&defrag->rb_node, parent, p); rb_link_node(&defrag->rb_node, parent, p);
rb_insert_color(&defrag->rb_node, &fs_info->defrag_inodes); rb_insert_color(&defrag->rb_node, &fs_info->defrag_inodes);
return 0; return 0;
@ -145,10 +145,10 @@ static inline int __need_auto_defrag(struct btrfs_fs_info *fs_info)
* enabled * enabled
*/ */
int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans, int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
struct inode *inode) struct btrfs_inode *inode)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_root *root = inode->root;
struct inode_defrag *defrag; struct inode_defrag *defrag;
u64 transid; u64 transid;
int ret; int ret;
@ -156,24 +156,24 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
if (!__need_auto_defrag(fs_info)) if (!__need_auto_defrag(fs_info))
return 0; return 0;
if (test_bit(BTRFS_INODE_IN_DEFRAG, &BTRFS_I(inode)->runtime_flags)) if (test_bit(BTRFS_INODE_IN_DEFRAG, &inode->runtime_flags))
return 0; return 0;
if (trans) if (trans)
transid = trans->transid; transid = trans->transid;
else else
transid = BTRFS_I(inode)->root->last_trans; transid = inode->root->last_trans;
defrag = kmem_cache_zalloc(btrfs_inode_defrag_cachep, GFP_NOFS); defrag = kmem_cache_zalloc(btrfs_inode_defrag_cachep, GFP_NOFS);
if (!defrag) if (!defrag)
return -ENOMEM; return -ENOMEM;
defrag->ino = btrfs_ino(BTRFS_I(inode)); defrag->ino = btrfs_ino(inode);
defrag->transid = transid; defrag->transid = transid;
defrag->root = root->root_key.objectid; defrag->root = root->root_key.objectid;
spin_lock(&fs_info->defrag_inodes_lock); spin_lock(&fs_info->defrag_inodes_lock);
if (!test_bit(BTRFS_INODE_IN_DEFRAG, &BTRFS_I(inode)->runtime_flags)) { if (!test_bit(BTRFS_INODE_IN_DEFRAG, &inode->runtime_flags)) {
/* /*
* If we set IN_DEFRAG flag and evict the inode from memory, * If we set IN_DEFRAG flag and evict the inode from memory,
* and then re-read this inode, this new inode doesn't have * and then re-read this inode, this new inode doesn't have
@ -194,10 +194,10 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
* the same inode in the tree, we will merge them together (by * the same inode in the tree, we will merge them together (by
* __btrfs_add_inode_defrag()) and free the one that we want to requeue. * __btrfs_add_inode_defrag()) and free the one that we want to requeue.
*/ */
static void btrfs_requeue_inode_defrag(struct inode *inode, static void btrfs_requeue_inode_defrag(struct btrfs_inode *inode,
struct inode_defrag *defrag) struct inode_defrag *defrag)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
int ret; int ret;
if (!__need_auto_defrag(fs_info)) if (!__need_auto_defrag(fs_info))
@ -334,7 +334,7 @@ static int __btrfs_run_defrag_inode(struct btrfs_fs_info *fs_info,
*/ */
if (num_defrag == BTRFS_DEFRAG_BATCH) { if (num_defrag == BTRFS_DEFRAG_BATCH) {
defrag->last_offset = range.start; defrag->last_offset = range.start;
btrfs_requeue_inode_defrag(inode, defrag); btrfs_requeue_inode_defrag(BTRFS_I(inode), defrag);
} else if (defrag->last_offset && !defrag->cycled) { } else if (defrag->last_offset && !defrag->cycled) {
/* /*
* we didn't fill our defrag batch, but * we didn't fill our defrag batch, but
@ -343,7 +343,7 @@ static int __btrfs_run_defrag_inode(struct btrfs_fs_info *fs_info,
*/ */
defrag->last_offset = 0; defrag->last_offset = 0;
defrag->cycled = 1; defrag->cycled = 1;
btrfs_requeue_inode_defrag(inode, defrag); btrfs_requeue_inode_defrag(BTRFS_I(inode), defrag);
} else { } else {
kmem_cache_free(btrfs_inode_defrag_cachep, defrag); kmem_cache_free(btrfs_inode_defrag_cachep, defrag);
} }
@ -529,13 +529,13 @@ int btrfs_dirty_pages(struct inode *inode, struct page **pages,
* this drops all the extents in the cache that intersect the range * this drops all the extents in the cache that intersect the range
* [start, end]. Existing extents are split as required. * [start, end]. Existing extents are split as required.
*/ */
void btrfs_drop_extent_cache(struct inode *inode, u64 start, u64 end, void btrfs_drop_extent_cache(struct btrfs_inode *inode, u64 start, u64 end,
int skip_pinned) int skip_pinned)
{ {
struct extent_map *em; struct extent_map *em;
struct extent_map *split = NULL; struct extent_map *split = NULL;
struct extent_map *split2 = NULL; struct extent_map *split2 = NULL;
struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree; struct extent_map_tree *em_tree = &inode->extent_tree;
u64 len = end - start + 1; u64 len = end - start + 1;
u64 gen; u64 gen;
int ret; int ret;
@ -720,7 +720,7 @@ int __btrfs_drop_extents(struct btrfs_trans_handle *trans,
int leafs_visited = 0; int leafs_visited = 0;
if (drop_cache) if (drop_cache)
btrfs_drop_extent_cache(inode, start, end - 1, 0); btrfs_drop_extent_cache(BTRFS_I(inode), start, end - 1, 0);
if (start >= BTRFS_I(inode)->disk_i_size && !replace_extent) if (start >= BTRFS_I(inode)->disk_i_size && !replace_extent)
modify_tree = 0; modify_tree = 0;
@ -1082,10 +1082,10 @@ static int extent_mergeable(struct extent_buffer *leaf, int slot,
* two or three. * two or three.
*/ */
int btrfs_mark_extent_written(struct btrfs_trans_handle *trans, int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,
struct inode *inode, u64 start, u64 end) struct btrfs_inode *inode, u64 start, u64 end)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_root *root = inode->root;
struct extent_buffer *leaf; struct extent_buffer *leaf;
struct btrfs_path *path; struct btrfs_path *path;
struct btrfs_file_extent_item *fi; struct btrfs_file_extent_item *fi;
@ -1102,7 +1102,7 @@ int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,
int del_slot = 0; int del_slot = 0;
int recow; int recow;
int ret; int ret;
u64 ino = btrfs_ino(BTRFS_I(inode)); u64 ino = btrfs_ino(inode);
path = btrfs_alloc_path(); path = btrfs_alloc_path();
if (!path) if (!path)
@ -1415,13 +1415,13 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages,
* the other < 0 number - Something wrong happens * the other < 0 number - Something wrong happens
*/ */
static noinline int static noinline int
lock_and_cleanup_extent_if_need(struct inode *inode, struct page **pages, lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,
size_t num_pages, loff_t pos, size_t num_pages, loff_t pos,
size_t write_bytes, size_t write_bytes,
u64 *lockstart, u64 *lockend, u64 *lockstart, u64 *lockend,
struct extent_state **cached_state) struct extent_state **cached_state)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
u64 start_pos; u64 start_pos;
u64 last_pos; u64 last_pos;
int i; int i;
@ -1432,30 +1432,30 @@ lock_and_cleanup_extent_if_need(struct inode *inode, struct page **pages,
+ round_up(pos + write_bytes - start_pos, + round_up(pos + write_bytes - start_pos,
fs_info->sectorsize) - 1; fs_info->sectorsize) - 1;
if (start_pos < inode->i_size) { if (start_pos < inode->vfs_inode.i_size) {
struct btrfs_ordered_extent *ordered; struct btrfs_ordered_extent *ordered;
lock_extent_bits(&BTRFS_I(inode)->io_tree, lock_extent_bits(&inode->io_tree, start_pos, last_pos,
start_pos, last_pos, cached_state); cached_state);
ordered = btrfs_lookup_ordered_range(inode, start_pos, ordered = btrfs_lookup_ordered_range(inode, start_pos,
last_pos - start_pos + 1); last_pos - start_pos + 1);
if (ordered && if (ordered &&
ordered->file_offset + ordered->len > start_pos && ordered->file_offset + ordered->len > start_pos &&
ordered->file_offset <= last_pos) { ordered->file_offset <= last_pos) {
unlock_extent_cached(&BTRFS_I(inode)->io_tree, unlock_extent_cached(&inode->io_tree, start_pos,
start_pos, last_pos, last_pos, cached_state, GFP_NOFS);
cached_state, GFP_NOFS);
for (i = 0; i < num_pages; i++) { for (i = 0; i < num_pages; i++) {
unlock_page(pages[i]); unlock_page(pages[i]);
put_page(pages[i]); put_page(pages[i]);
} }
btrfs_start_ordered_extent(inode, ordered, 1); btrfs_start_ordered_extent(&inode->vfs_inode,
ordered, 1);
btrfs_put_ordered_extent(ordered); btrfs_put_ordered_extent(ordered);
return -EAGAIN; return -EAGAIN;
} }
if (ordered) if (ordered)
btrfs_put_ordered_extent(ordered); btrfs_put_ordered_extent(ordered);
clear_extent_bit(&BTRFS_I(inode)->io_tree, start_pos, clear_extent_bit(&inode->io_tree, start_pos,
last_pos, EXTENT_DIRTY | EXTENT_DELALLOC | last_pos, EXTENT_DIRTY | EXTENT_DELALLOC |
EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,
0, 0, cached_state, GFP_NOFS); 0, 0, cached_state, GFP_NOFS);
@ -1474,11 +1474,11 @@ lock_and_cleanup_extent_if_need(struct inode *inode, struct page **pages,
return ret; return ret;
} }
static noinline int check_can_nocow(struct inode *inode, loff_t pos, static noinline int check_can_nocow(struct btrfs_inode *inode, loff_t pos,
size_t *write_bytes) size_t *write_bytes)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_root *root = inode->root;
struct btrfs_ordered_extent *ordered; struct btrfs_ordered_extent *ordered;
u64 lockstart, lockend; u64 lockstart, lockend;
u64 num_bytes; u64 num_bytes;
@ -1493,19 +1493,20 @@ static noinline int check_can_nocow(struct inode *inode, loff_t pos,
fs_info->sectorsize) - 1; fs_info->sectorsize) - 1;
while (1) { while (1) {
lock_extent(&BTRFS_I(inode)->io_tree, lockstart, lockend); lock_extent(&inode->io_tree, lockstart, lockend);
ordered = btrfs_lookup_ordered_range(inode, lockstart, ordered = btrfs_lookup_ordered_range(inode, lockstart,
lockend - lockstart + 1); lockend - lockstart + 1);
if (!ordered) { if (!ordered) {
break; break;
} }
unlock_extent(&BTRFS_I(inode)->io_tree, lockstart, lockend); unlock_extent(&inode->io_tree, lockstart, lockend);
btrfs_start_ordered_extent(inode, ordered, 1); btrfs_start_ordered_extent(&inode->vfs_inode, ordered, 1);
btrfs_put_ordered_extent(ordered); btrfs_put_ordered_extent(ordered);
} }
num_bytes = lockend - lockstart + 1; num_bytes = lockend - lockstart + 1;
ret = can_nocow_extent(inode, lockstart, &num_bytes, NULL, NULL, NULL); ret = can_nocow_extent(&inode->vfs_inode, lockstart, &num_bytes,
NULL, NULL, NULL);
if (ret <= 0) { if (ret <= 0) {
ret = 0; ret = 0;
btrfs_end_write_no_snapshoting(root); btrfs_end_write_no_snapshoting(root);
@ -1514,7 +1515,7 @@ static noinline int check_can_nocow(struct inode *inode, loff_t pos,
num_bytes - pos + lockstart); num_bytes - pos + lockstart);
} }
unlock_extent(&BTRFS_I(inode)->io_tree, lockstart, lockend); unlock_extent(&inode->io_tree, lockstart, lockend);
return ret; return ret;
} }
@ -1579,7 +1580,8 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
if (ret < 0) { if (ret < 0) {
if ((BTRFS_I(inode)->flags & (BTRFS_INODE_NODATACOW | if ((BTRFS_I(inode)->flags & (BTRFS_INODE_NODATACOW |
BTRFS_INODE_PREALLOC)) && BTRFS_INODE_PREALLOC)) &&
check_can_nocow(inode, pos, &write_bytes) > 0) { check_can_nocow(BTRFS_I(inode), pos,
&write_bytes) > 0) {
/* /*
* For nodata cow case, no need to reserve * For nodata cow case, no need to reserve
* data space. * data space.
@ -1599,7 +1601,8 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
} }
} }
ret = btrfs_delalloc_reserve_metadata(inode, reserve_bytes); ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode),
reserve_bytes);
if (ret) { if (ret) {
if (!only_release_metadata) if (!only_release_metadata)
btrfs_free_reserved_data_space(inode, pos, btrfs_free_reserved_data_space(inode, pos,
@ -1623,9 +1626,9 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
if (ret) if (ret)
break; break;
ret = lock_and_cleanup_extent_if_need(inode, pages, num_pages, ret = lock_and_cleanup_extent_if_need(BTRFS_I(inode), pages,
pos, write_bytes, &lockstart, num_pages, pos, write_bytes, &lockstart,
&lockend, &cached_state); &lockend, &cached_state);
if (ret < 0) { if (ret < 0) {
if (ret == -EAGAIN) if (ret == -EAGAIN)
goto again; goto again;
@ -1677,7 +1680,7 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
spin_unlock(&BTRFS_I(inode)->lock); spin_unlock(&BTRFS_I(inode)->lock);
} }
if (only_release_metadata) { if (only_release_metadata) {
btrfs_delalloc_release_metadata(inode, btrfs_delalloc_release_metadata(BTRFS_I(inode),
release_bytes); release_bytes);
} else { } else {
u64 __pos; u64 __pos;
@ -1738,7 +1741,8 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
if (release_bytes) { if (release_bytes) {
if (only_release_metadata) { if (only_release_metadata) {
btrfs_end_write_no_snapshoting(root); btrfs_end_write_no_snapshoting(root);
btrfs_delalloc_release_metadata(inode, release_bytes); btrfs_delalloc_release_metadata(BTRFS_I(inode),
release_bytes);
} else { } else {
btrfs_delalloc_release_space(inode, btrfs_delalloc_release_space(inode,
round_down(pos, fs_info->sectorsize), round_down(pos, fs_info->sectorsize),
@ -2193,7 +2197,7 @@ static int btrfs_file_mmap(struct file *filp, struct vm_area_struct *vma)
return 0; return 0;
} }
static int hole_mergeable(struct inode *inode, struct extent_buffer *leaf, static int hole_mergeable(struct btrfs_inode *inode, struct extent_buffer *leaf,
int slot, u64 start, u64 end) int slot, u64 start, u64 end)
{ {
struct btrfs_file_extent_item *fi; struct btrfs_file_extent_item *fi;
@ -2203,7 +2207,7 @@ static int hole_mergeable(struct inode *inode, struct extent_buffer *leaf,
return 0; return 0;
btrfs_item_key_to_cpu(leaf, &key, slot); btrfs_item_key_to_cpu(leaf, &key, slot);
if (key.objectid != btrfs_ino(BTRFS_I(inode)) || if (key.objectid != btrfs_ino(inode) ||
key.type != BTRFS_EXTENT_DATA_KEY) key.type != BTRFS_EXTENT_DATA_KEY)
return 0; return 0;
@ -2222,22 +2226,23 @@ static int hole_mergeable(struct inode *inode, struct extent_buffer *leaf,
return 0; return 0;
} }
static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode, static int fill_holes(struct btrfs_trans_handle *trans,
struct btrfs_path *path, u64 offset, u64 end) struct btrfs_inode *inode,
struct btrfs_path *path, u64 offset, u64 end)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_root *root = inode->root;
struct extent_buffer *leaf; struct extent_buffer *leaf;
struct btrfs_file_extent_item *fi; struct btrfs_file_extent_item *fi;
struct extent_map *hole_em; struct extent_map *hole_em;
struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree; struct extent_map_tree *em_tree = &inode->extent_tree;
struct btrfs_key key; struct btrfs_key key;
int ret; int ret;
if (btrfs_fs_incompat(fs_info, NO_HOLES)) if (btrfs_fs_incompat(fs_info, NO_HOLES))
goto out; goto out;
key.objectid = btrfs_ino(BTRFS_I(inode)); key.objectid = btrfs_ino(inode);
key.type = BTRFS_EXTENT_DATA_KEY; key.type = BTRFS_EXTENT_DATA_KEY;
key.offset = offset; key.offset = offset;
@ -2253,7 +2258,7 @@ static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode,
} }
leaf = path->nodes[0]; leaf = path->nodes[0];
if (hole_mergeable(inode, leaf, path->slots[0]-1, offset, end)) { if (hole_mergeable(inode, leaf, path->slots[0] - 1, offset, end)) {
u64 num_bytes; u64 num_bytes;
path->slots[0]--; path->slots[0]--;
@ -2285,7 +2290,7 @@ static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode,
} }
btrfs_release_path(path); btrfs_release_path(path);
ret = btrfs_insert_file_extent(trans, root, btrfs_ino(BTRFS_I(inode)), ret = btrfs_insert_file_extent(trans, root, btrfs_ino(inode),
offset, 0, 0, end - offset, 0, end - offset, 0, 0, 0); offset, 0, 0, end - offset, 0, end - offset, 0, 0, 0);
if (ret) if (ret)
return ret; return ret;
@ -2296,8 +2301,7 @@ static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode,
hole_em = alloc_extent_map(); hole_em = alloc_extent_map();
if (!hole_em) { if (!hole_em) {
btrfs_drop_extent_cache(inode, offset, end - 1, 0); btrfs_drop_extent_cache(inode, offset, end - 1, 0);
set_bit(BTRFS_INODE_NEEDS_FULL_SYNC, set_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &inode->runtime_flags);
&BTRFS_I(inode)->runtime_flags);
} else { } else {
hole_em->start = offset; hole_em->start = offset;
hole_em->len = end - offset; hole_em->len = end - offset;
@ -2320,7 +2324,7 @@ static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode,
free_extent_map(hole_em); free_extent_map(hole_em);
if (ret) if (ret)
set_bit(BTRFS_INODE_NEEDS_FULL_SYNC, set_bit(BTRFS_INODE_NEEDS_FULL_SYNC,
&BTRFS_I(inode)->runtime_flags); &inode->runtime_flags);
} }
return 0; return 0;
@ -2337,7 +2341,7 @@ static int find_first_non_hole(struct inode *inode, u64 *start, u64 *len)
struct extent_map *em; struct extent_map *em;
int ret = 0; int ret = 0;
em = btrfs_get_extent(inode, NULL, 0, *start, *len, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, *start, *len, 0);
if (IS_ERR_OR_NULL(em)) { if (IS_ERR_OR_NULL(em)) {
if (!em) if (!em)
ret = -ENOMEM; ret = -ENOMEM;
@ -2550,8 +2554,8 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
trans->block_rsv = &fs_info->trans_block_rsv; trans->block_rsv = &fs_info->trans_block_rsv;
if (cur_offset < drop_end && cur_offset < ino_size) { if (cur_offset < drop_end && cur_offset < ino_size) {
ret = fill_holes(trans, inode, path, cur_offset, ret = fill_holes(trans, BTRFS_I(inode), path,
drop_end); cur_offset, drop_end);
if (ret) { if (ret) {
/* /*
* If we failed then we didn't insert our hole * If we failed then we didn't insert our hole
@ -2622,7 +2626,8 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
* cur_offset == drop_end). * cur_offset == drop_end).
*/ */
if (cur_offset < ino_size && cur_offset < drop_end) { if (cur_offset < ino_size && cur_offset < drop_end) {
ret = fill_holes(trans, inode, path, cur_offset, drop_end); ret = fill_holes(trans, BTRFS_I(inode), path,
cur_offset, drop_end);
if (ret) { if (ret) {
/* Same comment as above. */ /* Same comment as above. */
btrfs_abort_transaction(trans, ret); btrfs_abort_transaction(trans, ret);
@ -2747,7 +2752,8 @@ static long btrfs_fallocate(struct file *file, int mode,
* *
* For qgroup space, it will be checked later. * For qgroup space, it will be checked later.
*/ */
ret = btrfs_alloc_data_chunk_ondemand(inode, alloc_end - alloc_start); ret = btrfs_alloc_data_chunk_ondemand(BTRFS_I(inode),
alloc_end - alloc_start);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -2827,7 +2833,7 @@ static long btrfs_fallocate(struct file *file, int mode,
/* First, check if we exceed the qgroup limit */ /* First, check if we exceed the qgroup limit */
INIT_LIST_HEAD(&reserve_list); INIT_LIST_HEAD(&reserve_list);
while (1) { while (1) {
em = btrfs_get_extent(inode, NULL, 0, cur_offset, em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, cur_offset,
alloc_end - cur_offset, 0); alloc_end - cur_offset, 0);
if (IS_ERR_OR_NULL(em)) { if (IS_ERR_OR_NULL(em)) {
if (!em) if (!em)
@ -2954,7 +2960,8 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int whence)
&cached_state); &cached_state);
while (start < inode->i_size) { while (start < inode->i_size) {
em = btrfs_get_extent_fiemap(inode, NULL, 0, start, len, 0); em = btrfs_get_extent_fiemap(BTRFS_I(inode), NULL, 0,
start, len, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
ret = PTR_ERR(em); ret = PTR_ERR(em);
em = NULL; em = NULL;

5
fs/btrfs/free-space-cache.c
View File

@ -260,7 +260,7 @@ int btrfs_truncate_free_space_cache(struct btrfs_trans_handle *trans,
btrfs_free_path(path); btrfs_free_path(path);
} }
btrfs_i_size_write(inode, 0); btrfs_i_size_write(BTRFS_I(inode), 0);
truncate_pagecache(inode, 0); truncate_pagecache(inode, 0);
/* /*
@ -3545,7 +3545,8 @@ int btrfs_write_out_ino_cache(struct btrfs_root *root,
if (ret) { if (ret) {
if (release_metadata) if (release_metadata)
btrfs_delalloc_release_metadata(inode, inode->i_size); btrfs_delalloc_release_metadata(BTRFS_I(inode),
inode->i_size);
#ifdef DEBUG #ifdef DEBUG
btrfs_err(fs_info, btrfs_err(fs_info,
"failed to write free ino cache for root %llu", "failed to write free ino cache for root %llu",

2
fs/btrfs/inode-map.c
View File

@ -499,7 +499,7 @@ int btrfs_save_ino_cache(struct btrfs_root *root,
ret = btrfs_prealloc_file_range_trans(inode, trans, 0, 0, prealloc, ret = btrfs_prealloc_file_range_trans(inode, trans, 0, 0, prealloc,
prealloc, prealloc, &alloc_hint); prealloc, prealloc, &alloc_hint);
if (ret) { if (ret) {
btrfs_delalloc_release_metadata(inode, prealloc); btrfs_delalloc_release_metadata(BTRFS_I(inode), prealloc);
goto out_put; goto out_put;
} }

416
fs/btrfs/inode.c
View File

File diff suppressed because it is too large Load Diff

38
fs/btrfs/ioctl.c
View File

@ -434,7 +434,7 @@ int btrfs_is_empty_uuid(u8 *uuid)
static noinline int create_subvol(struct inode *dir, static noinline int create_subvol(struct inode *dir,
struct dentry *dentry, struct dentry *dentry,
char *name, int namelen, const char *name, int namelen,
u64 *async_transid, u64 *async_transid,
struct btrfs_qgroup_inherit *inherit) struct btrfs_qgroup_inherit *inherit)
{ {
@ -580,21 +580,21 @@ static noinline int create_subvol(struct inode *dir,
/* /*
* insert the directory item * insert the directory item
*/ */
ret = btrfs_set_inode_index(dir, &index); ret = btrfs_set_inode_index(BTRFS_I(dir), &index);
if (ret) { if (ret) {
btrfs_abort_transaction(trans, ret); btrfs_abort_transaction(trans, ret);
goto fail; goto fail;
} }
ret = btrfs_insert_dir_item(trans, root, ret = btrfs_insert_dir_item(trans, root,
name, namelen, dir, &key, name, namelen, BTRFS_I(dir), &key,
BTRFS_FT_DIR, index); BTRFS_FT_DIR, index);
if (ret) { if (ret) {
btrfs_abort_transaction(trans, ret); btrfs_abort_transaction(trans, ret);
goto fail; goto fail;
} }
btrfs_i_size_write(dir, dir->i_size + namelen * 2); btrfs_i_size_write(BTRFS_I(dir), dir->i_size + namelen * 2);
ret = btrfs_update_inode(trans, root, dir); ret = btrfs_update_inode(trans, root, dir);
BUG_ON(ret); BUG_ON(ret);
@ -832,7 +832,7 @@ static inline int btrfs_may_create(struct inode *dir, struct dentry *child)
* inside this filesystem so it's quite a bit simpler. * inside this filesystem so it's quite a bit simpler.
*/ */
static noinline int btrfs_mksubvol(const struct path *parent, static noinline int btrfs_mksubvol(const struct path *parent,
char *name, int namelen, const char *name, int namelen,
struct btrfs_root *snap_src, struct btrfs_root *snap_src,
u64 *async_transid, bool readonly, u64 *async_transid, bool readonly,
struct btrfs_qgroup_inherit *inherit) struct btrfs_qgroup_inherit *inherit)
@ -1009,7 +1009,7 @@ static struct extent_map *defrag_lookup_extent(struct inode *inode, u64 start)
/* get the big lock and read metadata off disk */ /* get the big lock and read metadata off disk */
lock_extent_bits(io_tree, start, end, &cached); lock_extent_bits(io_tree, start, end, &cached);
em = btrfs_get_extent(inode, NULL, 0, start, len, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, start, len, 0);
unlock_extent_cached(io_tree, start, end, &cached, GFP_NOFS); unlock_extent_cached(io_tree, start, end, &cached, GFP_NOFS);
if (IS_ERR(em)) if (IS_ERR(em))
@ -1625,7 +1625,7 @@ static noinline int btrfs_ioctl_resize(struct file *file,
} }
static noinline int btrfs_ioctl_snap_create_transid(struct file *file, static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
char *name, unsigned long fd, int subvol, const char *name, unsigned long fd, int subvol,
u64 *transid, bool readonly, u64 *transid, bool readonly,
struct btrfs_qgroup_inherit *inherit) struct btrfs_qgroup_inherit *inherit)
{ {
@ -3298,7 +3298,7 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans,
if (endoff > destoff + olen) if (endoff > destoff + olen)
endoff = destoff + olen; endoff = destoff + olen;
if (endoff > inode->i_size) if (endoff > inode->i_size)
btrfs_i_size_write(inode, endoff); btrfs_i_size_write(BTRFS_I(inode), endoff);
ret = btrfs_update_inode(trans, root, inode); ret = btrfs_update_inode(trans, root, inode);
if (ret) { if (ret) {
@ -3311,20 +3311,19 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans,
return ret; return ret;
} }
static void clone_update_extent_map(struct inode *inode, static void clone_update_extent_map(struct btrfs_inode *inode,
const struct btrfs_trans_handle *trans, const struct btrfs_trans_handle *trans,
const struct btrfs_path *path, const struct btrfs_path *path,
const u64 hole_offset, const u64 hole_offset,
const u64 hole_len) const u64 hole_len)
{ {
struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree; struct extent_map_tree *em_tree = &inode->extent_tree;
struct extent_map *em; struct extent_map *em;
int ret; int ret;
em = alloc_extent_map(); em = alloc_extent_map();
if (!em) { if (!em) {
set_bit(BTRFS_INODE_NEEDS_FULL_SYNC, set_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &inode->runtime_flags);
&BTRFS_I(inode)->runtime_flags);
return; return;
} }
@ -3338,7 +3337,7 @@ static void clone_update_extent_map(struct inode *inode,
if (btrfs_file_extent_type(path->nodes[0], fi) == if (btrfs_file_extent_type(path->nodes[0], fi) ==
BTRFS_FILE_EXTENT_INLINE) BTRFS_FILE_EXTENT_INLINE)
set_bit(BTRFS_INODE_NEEDS_FULL_SYNC, set_bit(BTRFS_INODE_NEEDS_FULL_SYNC,
&BTRFS_I(inode)->runtime_flags); &inode->runtime_flags);
} else { } else {
em->start = hole_offset; em->start = hole_offset;
em->len = hole_len; em->len = hole_len;
@ -3364,8 +3363,7 @@ static void clone_update_extent_map(struct inode *inode,
} }
if (ret) if (ret)
set_bit(BTRFS_INODE_NEEDS_FULL_SYNC, set_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &inode->runtime_flags);
&BTRFS_I(inode)->runtime_flags);
} }
/* /*
@ -3791,11 +3789,12 @@ static int btrfs_clone(struct inode *src, struct inode *inode,
/* If we have an implicit hole (NO_HOLES feature). */ /* If we have an implicit hole (NO_HOLES feature). */
if (drop_start < new_key.offset) if (drop_start < new_key.offset)
clone_update_extent_map(inode, trans, clone_update_extent_map(BTRFS_I(inode), trans,
NULL, drop_start, NULL, drop_start,
new_key.offset - drop_start); new_key.offset - drop_start);
clone_update_extent_map(inode, trans, path, 0, 0); clone_update_extent_map(BTRFS_I(inode), trans,
path, 0, 0);
btrfs_mark_buffer_dirty(leaf); btrfs_mark_buffer_dirty(leaf);
btrfs_release_path(path); btrfs_release_path(path);
@ -3845,8 +3844,9 @@ static int btrfs_clone(struct inode *src, struct inode *inode,
btrfs_end_transaction(trans); btrfs_end_transaction(trans);
goto out; goto out;
} }
clone_update_extent_map(inode, trans, NULL, last_dest_end, clone_update_extent_map(BTRFS_I(inode), trans, NULL,
destoff + len - last_dest_end); last_dest_end,
destoff + len - last_dest_end);
ret = clone_finish_inode_update(trans, inode, destoff + len, ret = clone_finish_inode_update(trans, inode, destoff + len,
destoff, olen, no_time_update); destoff, olen, no_time_update);
} }

12
fs/btrfs/lzo.c
View File

@ -76,7 +76,7 @@ static inline void write_compress_length(char *buf, size_t len)
memcpy(buf, &dlen, LZO_LEN); memcpy(buf, &dlen, LZO_LEN);
} }
static inline size_t read_compress_length(char *buf) static inline size_t read_compress_length(const char *buf)
{ {
__le32 dlen; __le32 dlen;
@ -86,13 +86,11 @@ static inline size_t read_compress_length(char *buf)
static int lzo_compress_pages(struct list_head *ws, static int lzo_compress_pages(struct list_head *ws,
struct address_space *mapping, struct address_space *mapping,
u64 start, unsigned long len, u64 start,
struct page **pages, struct page **pages,
unsigned long nr_dest_pages,
unsigned long *out_pages, unsigned long *out_pages,
unsigned long *total_in, unsigned long *total_in,
unsigned long *total_out, unsigned long *total_out)
unsigned long max_out)
{ {
struct workspace *workspace = list_entry(ws, struct workspace, list); struct workspace *workspace = list_entry(ws, struct workspace, list);
int ret = 0; int ret = 0;
@ -102,7 +100,9 @@ static int lzo_compress_pages(struct list_head *ws,
struct page *in_page = NULL; struct page *in_page = NULL;
struct page *out_page = NULL; struct page *out_page = NULL;
unsigned long bytes_left; unsigned long bytes_left;
unsigned long len = *total_out;
unsigned long nr_dest_pages = *out_pages;
const unsigned long max_out = nr_dest_pages * PAGE_SIZE;
size_t in_len; size_t in_len;
size_t out_len; size_t out_len;
char *buf; char *buf;

9
fs/btrfs/ordered-data.c
View File

@ -879,15 +879,14 @@ struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct inode *inode,
/* Since the DIO code tries to lock a wide area we need to look for any ordered /* Since the DIO code tries to lock a wide area we need to look for any ordered
* extents that exist in the range, rather than just the start of the range. * extents that exist in the range, rather than just the start of the range.
*/ */
struct btrfs_ordered_extent *btrfs_lookup_ordered_range(struct inode *inode, struct btrfs_ordered_extent *btrfs_lookup_ordered_range(
u64 file_offset, struct btrfs_inode *inode, u64 file_offset, u64 len)
u64 len)
{ {
struct btrfs_ordered_inode_tree *tree; struct btrfs_ordered_inode_tree *tree;
struct rb_node *node; struct rb_node *node;
struct btrfs_ordered_extent *entry = NULL; struct btrfs_ordered_extent *entry = NULL;
tree = &BTRFS_I(inode)->ordered_tree; tree = &inode->ordered_tree;
spin_lock_irq(&tree->lock); spin_lock_irq(&tree->lock);
node = tree_search(tree, file_offset); node = tree_search(tree, file_offset);
if (!node) { if (!node) {
@ -923,7 +922,7 @@ bool btrfs_have_ordered_extents_in_range(struct inode *inode,
{ {
struct btrfs_ordered_extent *oe; struct btrfs_ordered_extent *oe;
oe = btrfs_lookup_ordered_range(inode, file_offset, len); oe = btrfs_lookup_ordered_range(BTRFS_I(inode), file_offset, len);
if (oe) { if (oe) {
btrfs_put_ordered_extent(oe); btrfs_put_ordered_extent(oe);
return true; return true;

7
fs/btrfs/ordered-data.h
View File

@ -189,9 +189,10 @@ void btrfs_start_ordered_extent(struct inode *inode,
int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len); int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len);
struct btrfs_ordered_extent * struct btrfs_ordered_extent *
btrfs_lookup_first_ordered_extent(struct inode * inode, u64 file_offset); btrfs_lookup_first_ordered_extent(struct inode * inode, u64 file_offset);
struct btrfs_ordered_extent *btrfs_lookup_ordered_range(struct inode *inode, struct btrfs_ordered_extent *btrfs_lookup_ordered_range(
u64 file_offset, struct btrfs_inode *inode,
u64 len); u64 file_offset,
u64 len);
bool btrfs_have_ordered_extents_in_range(struct inode *inode, bool btrfs_have_ordered_extents_in_range(struct inode *inode,
u64 file_offset, u64 file_offset,
u64 len); u64 len);

17
fs/btrfs/relocation.c
View File

@ -1714,8 +1714,8 @@ int replace_file_extents(struct btrfs_trans_handle *trans,
if (!ret) if (!ret)
continue; continue;
btrfs_drop_extent_cache(inode, key.offset, end, btrfs_drop_extent_cache(BTRFS_I(inode),
1); key.offset, end, 1);
unlock_extent(&BTRFS_I(inode)->io_tree, unlock_extent(&BTRFS_I(inode)->io_tree,
key.offset, end); key.offset, end);
} }
@ -2130,7 +2130,7 @@ static int invalidate_extent_cache(struct btrfs_root *root,
/* the lock_extent waits for readpage to complete */ /* the lock_extent waits for readpage to complete */
lock_extent(&BTRFS_I(inode)->io_tree, start, end); lock_extent(&BTRFS_I(inode)->io_tree, start, end);
btrfs_drop_extent_cache(inode, start, end, 1); btrfs_drop_extent_cache(BTRFS_I(inode), start, end, 1);
unlock_extent(&BTRFS_I(inode)->io_tree, start, end); unlock_extent(&BTRFS_I(inode)->io_tree, start, end);
} }
return 0; return 0;
@ -3161,7 +3161,7 @@ int setup_extent_mapping(struct inode *inode, u64 start, u64 end,
free_extent_map(em); free_extent_map(em);
break; break;
} }
btrfs_drop_extent_cache(inode, start, end, 0); btrfs_drop_extent_cache(BTRFS_I(inode), start, end, 0);
} }
unlock_extent(&BTRFS_I(inode)->io_tree, start, end); unlock_extent(&BTRFS_I(inode)->io_tree, start, end);
return ret; return ret;
@ -3203,7 +3203,8 @@ static int relocate_file_extent_cluster(struct inode *inode,
index = (cluster->start - offset) >> PAGE_SHIFT; index = (cluster->start - offset) >> PAGE_SHIFT;
last_index = (cluster->end - offset) >> PAGE_SHIFT; last_index = (cluster->end - offset) >> PAGE_SHIFT;
while (index <= last_index) { while (index <= last_index) {
ret = btrfs_delalloc_reserve_metadata(inode, PAGE_SIZE); ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode),
PAGE_SIZE);
if (ret) if (ret)
goto out; goto out;
@ -3215,7 +3216,7 @@ static int relocate_file_extent_cluster(struct inode *inode,
page = find_or_create_page(inode->i_mapping, index, page = find_or_create_page(inode->i_mapping, index,
mask); mask);
if (!page) { if (!page) {
btrfs_delalloc_release_metadata(inode, btrfs_delalloc_release_metadata(BTRFS_I(inode),
PAGE_SIZE); PAGE_SIZE);
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
@ -3234,7 +3235,7 @@ static int relocate_file_extent_cluster(struct inode *inode,
if (!PageUptodate(page)) { if (!PageUptodate(page)) {
unlock_page(page); unlock_page(page);
put_page(page); put_page(page);
btrfs_delalloc_release_metadata(inode, btrfs_delalloc_release_metadata(BTRFS_I(inode),
PAGE_SIZE); PAGE_SIZE);
ret = -EIO; ret = -EIO;
goto out; goto out;
@ -4245,7 +4246,7 @@ struct inode *create_reloc_inode(struct btrfs_fs_info *fs_info,
BUG_ON(IS_ERR(inode) || is_bad_inode(inode)); BUG_ON(IS_ERR(inode) || is_bad_inode(inode));
BTRFS_I(inode)->index_cnt = group->key.objectid; BTRFS_I(inode)->index_cnt = group->key.objectid;
err = btrfs_orphan_add(trans, inode); err = btrfs_orphan_add(trans, BTRFS_I(inode));
out: out:
btrfs_end_transaction(trans); btrfs_end_transaction(trans);
btrfs_btree_balance_dirty(fs_info); btrfs_btree_balance_dirty(fs_info);

11
fs/btrfs/scrub.c
View File

@ -731,7 +731,7 @@ static int scrub_fixup_readpage(u64 inum, u64 offset, u64 root, void *fixup_ctx)
ret = -EIO; ret = -EIO;
goto out; goto out;
} }
ret = repair_io_failure(inode, offset, PAGE_SIZE, ret = repair_io_failure(BTRFS_I(inode), offset, PAGE_SIZE,
fixup->logical, page, fixup->logical, page,
offset - page_offset(page), offset - page_offset(page),
fixup->mirror_num); fixup->mirror_num);
@ -4236,7 +4236,7 @@ static void copy_nocow_pages_worker(struct btrfs_work *work)
scrub_pending_trans_workers_dec(sctx); scrub_pending_trans_workers_dec(sctx);
} }
static int check_extent_to_block(struct inode *inode, u64 start, u64 len, static int check_extent_to_block(struct btrfs_inode *inode, u64 start, u64 len,
u64 logical) u64 logical)
{ {
struct extent_state *cached_state = NULL; struct extent_state *cached_state = NULL;
@ -4246,7 +4246,7 @@ static int check_extent_to_block(struct inode *inode, u64 start, u64 len,
u64 lockstart = start, lockend = start + len - 1; u64 lockstart = start, lockend = start + len - 1;
int ret = 0; int ret = 0;
io_tree = &BTRFS_I(inode)->io_tree; io_tree = &inode->io_tree;
lock_extent_bits(io_tree, lockstart, lockend, &cached_state); lock_extent_bits(io_tree, lockstart, lockend, &cached_state);
ordered = btrfs_lookup_ordered_range(inode, lockstart, len); ordered = btrfs_lookup_ordered_range(inode, lockstart, len);
@ -4325,7 +4325,8 @@ static int copy_nocow_pages_for_inode(u64 inum, u64 offset, u64 root,
io_tree = &BTRFS_I(inode)->io_tree; io_tree = &BTRFS_I(inode)->io_tree;
nocow_ctx_logical = nocow_ctx->logical; nocow_ctx_logical = nocow_ctx->logical;
ret = check_extent_to_block(inode, offset, len, nocow_ctx_logical); ret = check_extent_to_block(BTRFS_I(inode), offset, len,
nocow_ctx_logical);
if (ret) { if (ret) {
ret = ret > 0 ? 0 : ret; ret = ret > 0 ? 0 : ret;
goto out; goto out;
@ -4372,7 +4373,7 @@ static int copy_nocow_pages_for_inode(u64 inum, u64 offset, u64 root,
} }
} }
ret = check_extent_to_block(inode, offset, len, ret = check_extent_to_block(BTRFS_I(inode), offset, len,
nocow_ctx_logical); nocow_ctx_logical);
if (ret) { if (ret) {
ret = ret > 0 ? 0 : ret; ret = ret > 0 ? 0 : ret;

46
fs/btrfs/tests/inode-tests.c
View File

@ -278,7 +278,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
/* First with no extents */ /* First with no extents */
BTRFS_I(inode)->root = root; BTRFS_I(inode)->root = root;
em = btrfs_get_extent(inode, NULL, 0, 0, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
em = NULL; em = NULL;
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
@ -293,7 +293,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
goto out; goto out;
} }
free_extent_map(em); free_extent_map(em);
btrfs_drop_extent_cache(inode, 0, (u64)-1, 0); btrfs_drop_extent_cache(BTRFS_I(inode), 0, (u64)-1, 0);
/* /*
* All of the magic numbers are based on the mapping setup in * All of the magic numbers are based on the mapping setup in
@ -302,7 +302,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
*/ */
setup_file_extents(root, sectorsize); setup_file_extents(root, sectorsize);
em = btrfs_get_extent(inode, NULL, 0, 0, (u64)-1, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, (u64)-1, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -323,7 +323,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
offset = em->start + em->len; offset = em->start + em->len;
free_extent_map(em); free_extent_map(em);
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -350,7 +350,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
offset = em->start + em->len; offset = em->start + em->len;
free_extent_map(em); free_extent_map(em);
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -372,7 +372,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
free_extent_map(em); free_extent_map(em);
/* Regular extent */ /* Regular extent */
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -399,7 +399,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
free_extent_map(em); free_extent_map(em);
/* The next 3 are split extents */ /* The next 3 are split extents */
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -428,7 +428,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
offset = em->start + em->len; offset = em->start + em->len;
free_extent_map(em); free_extent_map(em);
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -450,7 +450,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
offset = em->start + em->len; offset = em->start + em->len;
free_extent_map(em); free_extent_map(em);
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -484,7 +484,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
free_extent_map(em); free_extent_map(em);
/* Prealloc extent */ /* Prealloc extent */
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -513,7 +513,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
free_extent_map(em); free_extent_map(em);
/* The next 3 are a half written prealloc extent */ /* The next 3 are a half written prealloc extent */
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -543,7 +543,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
offset = em->start + em->len; offset = em->start + em->len;
free_extent_map(em); free_extent_map(em);
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -576,7 +576,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
offset = em->start + em->len; offset = em->start + em->len;
free_extent_map(em); free_extent_map(em);
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -611,7 +611,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
free_extent_map(em); free_extent_map(em);
/* Now for the compressed extent */ /* Now for the compressed extent */
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -645,7 +645,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
free_extent_map(em); free_extent_map(em);
/* Split compressed extent */ /* Split compressed extent */
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -680,7 +680,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
offset = em->start + em->len; offset = em->start + em->len;
free_extent_map(em); free_extent_map(em);
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -707,7 +707,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
offset = em->start + em->len; offset = em->start + em->len;
free_extent_map(em); free_extent_map(em);
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -742,7 +742,8 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
free_extent_map(em); free_extent_map(em);
/* A hole between regular extents but no hole extent */ /* A hole between regular extents but no hole extent */
em = btrfs_get_extent(inode, NULL, 0, offset + 6, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset + 6,
sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -769,7 +770,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
offset = em->start + em->len; offset = em->start + em->len;
free_extent_map(em); free_extent_map(em);
em = btrfs_get_extent(inode, NULL, 0, offset, 4096 * 1024, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, 4096 * 1024, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -802,7 +803,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)
offset = em->start + em->len; offset = em->start + em->len;
free_extent_map(em); free_extent_map(em);
em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -885,7 +886,7 @@ static int test_hole_first(u32 sectorsize, u32 nodesize)
insert_inode_item_key(root); insert_inode_item_key(root);
insert_extent(root, sectorsize, sectorsize, sectorsize, 0, sectorsize, insert_extent(root, sectorsize, sectorsize, sectorsize, 0, sectorsize,
sectorsize, BTRFS_FILE_EXTENT_REG, 0, 1); sectorsize, BTRFS_FILE_EXTENT_REG, 0, 1);
em = btrfs_get_extent(inode, NULL, 0, 0, 2 * sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, 2 * sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;
@ -907,7 +908,8 @@ static int test_hole_first(u32 sectorsize, u32 nodesize)
} }
free_extent_map(em); free_extent_map(em);
em = btrfs_get_extent(inode, NULL, 0, sectorsize, 2 * sectorsize, 0); em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, sectorsize,
2 * sectorsize, 0);
if (IS_ERR(em)) { if (IS_ERR(em)) {
test_msg("Got an error when we shouldn't have\n"); test_msg("Got an error when we shouldn't have\n");
goto out; goto out;

6
fs/btrfs/transaction.c
View File

@ -1505,7 +1505,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
/* /*
* insert the directory item * insert the directory item
*/ */
ret = btrfs_set_inode_index(parent_inode, &index); ret = btrfs_set_inode_index(BTRFS_I(parent_inode), &index);
BUG_ON(ret); /* -ENOMEM */ BUG_ON(ret); /* -ENOMEM */
/* check if there is a file/dir which has the same name. */ /* check if there is a file/dir which has the same name. */
@ -1644,7 +1644,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
ret = btrfs_insert_dir_item(trans, parent_root, ret = btrfs_insert_dir_item(trans, parent_root,
dentry->d_name.name, dentry->d_name.len, dentry->d_name.name, dentry->d_name.len,
parent_inode, &key, BTRFS_I(parent_inode), &key,
BTRFS_FT_DIR, index); BTRFS_FT_DIR, index);
/* We have check then name at the beginning, so it is impossible. */ /* We have check then name at the beginning, so it is impossible. */
BUG_ON(ret == -EEXIST || ret == -EOVERFLOW); BUG_ON(ret == -EEXIST || ret == -EOVERFLOW);
@ -1653,7 +1653,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
goto fail; goto fail;
} }
btrfs_i_size_write(parent_inode, parent_inode->i_size + btrfs_i_size_write(BTRFS_I(parent_inode), parent_inode->i_size +
dentry->d_name.len * 2); dentry->d_name.len * 2);
parent_inode->i_mtime = parent_inode->i_ctime = parent_inode->i_mtime = parent_inode->i_ctime =
current_time(parent_inode); current_time(parent_inode);

92
fs/btrfs/tree-log.c
View File

@ -1327,8 +1327,9 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,
} }
/* insert our name */ /* insert our name */
ret = btrfs_add_link(trans, dir, inode, name, namelen, ret = btrfs_add_link(trans, BTRFS_I(dir),
0, ref_index); BTRFS_I(inode),
name, namelen, 0, ref_index);
if (ret) if (ret)
goto out; goto out;
@ -1646,7 +1647,8 @@ static noinline int insert_one_name(struct btrfs_trans_handle *trans,
return -EIO; return -EIO;
} }
ret = btrfs_add_link(trans, dir, inode, name, name_len, 1, index); ret = btrfs_add_link(trans, BTRFS_I(dir), BTRFS_I(inode), name,
name_len, 1, index);
/* FIXME, put inode into FIXUP list */ /* FIXME, put inode into FIXUP list */
@ -1785,7 +1787,7 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans,
out: out:
btrfs_release_path(path); btrfs_release_path(path);
if (!ret && update_size) { if (!ret && update_size) {
btrfs_i_size_write(dir, dir->i_size + name_len * 2); btrfs_i_size_write(BTRFS_I(dir), dir->i_size + name_len * 2);
ret = btrfs_update_inode(trans, root, dir); ret = btrfs_update_inode(trans, root, dir);
} }
kfree(name); kfree(name);
@ -5050,14 +5052,14 @@ static bool btrfs_must_commit_transaction(struct btrfs_trans_handle *trans,
* a full commit is required. * a full commit is required.
*/ */
static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans, static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
struct inode *inode, struct btrfs_inode *inode,
struct dentry *parent, struct dentry *parent,
struct super_block *sb, struct super_block *sb,
u64 last_committed) u64 last_committed)
{ {
int ret = 0; int ret = 0;
struct dentry *old_parent = NULL; struct dentry *old_parent = NULL;
struct inode *orig_inode = inode; struct btrfs_inode *orig_inode = inode;
/* /*
* for regular files, if its inode is already on disk, we don't * for regular files, if its inode is already on disk, we don't
@ -5065,15 +5067,15 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
* we can use the last_unlink_trans field to record renames * we can use the last_unlink_trans field to record renames
* and other fun in this file. * and other fun in this file.
*/ */
if (S_ISREG(inode->i_mode) && if (S_ISREG(inode->vfs_inode.i_mode) &&
BTRFS_I(inode)->generation <= last_committed && inode->generation <= last_committed &&
BTRFS_I(inode)->last_unlink_trans <= last_committed) inode->last_unlink_trans <= last_committed)
goto out; goto out;
if (!S_ISDIR(inode->i_mode)) { if (!S_ISDIR(inode->vfs_inode.i_mode)) {
if (!parent || d_really_is_negative(parent) || sb != parent->d_sb) if (!parent || d_really_is_negative(parent) || sb != parent->d_sb)
goto out; goto out;
inode = d_inode(parent); inode = BTRFS_I(d_inode(parent));
} }
while (1) { while (1) {
@ -5084,10 +5086,10 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
* think this inode has already been logged. * think this inode has already been logged.
*/ */
if (inode != orig_inode) if (inode != orig_inode)
BTRFS_I(inode)->logged_trans = trans->transid; inode->logged_trans = trans->transid;
smp_mb(); smp_mb();
if (btrfs_must_commit_transaction(trans, BTRFS_I(inode))) { if (btrfs_must_commit_transaction(trans, inode)) {
ret = 1; ret = 1;
break; break;
} }
@ -5096,8 +5098,8 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
break; break;
if (IS_ROOT(parent)) { if (IS_ROOT(parent)) {
inode = d_inode(parent); inode = BTRFS_I(d_inode(parent));
if (btrfs_must_commit_transaction(trans, BTRFS_I(inode))) if (btrfs_must_commit_transaction(trans, inode))
ret = 1; ret = 1;
break; break;
} }
@ -5105,7 +5107,7 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
parent = dget_parent(parent); parent = dget_parent(parent);
dput(old_parent); dput(old_parent);
old_parent = parent; old_parent = parent;
inode = d_inode(parent); inode = BTRFS_I(d_inode(parent));
} }
dput(old_parent); dput(old_parent);
@ -5292,15 +5294,15 @@ static int log_new_dir_dentries(struct btrfs_trans_handle *trans,
} }
static int btrfs_log_all_parents(struct btrfs_trans_handle *trans, static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,
struct inode *inode, struct btrfs_inode *inode,
struct btrfs_log_ctx *ctx) struct btrfs_log_ctx *ctx)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
int ret; int ret;
struct btrfs_path *path; struct btrfs_path *path;
struct btrfs_key key; struct btrfs_key key;
struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_root *root = inode->root;
const u64 ino = btrfs_ino(BTRFS_I(inode)); const u64 ino = btrfs_ino(inode);
path = btrfs_alloc_path(); path = btrfs_alloc_path();
if (!path) if (!path)
@ -5395,7 +5397,8 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,
* the last committed transaction * the last committed transaction
*/ */
static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans, static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct inode *inode, struct btrfs_root *root,
struct btrfs_inode *inode,
struct dentry *parent, struct dentry *parent,
const loff_t start, const loff_t start,
const loff_t end, const loff_t end,
@ -5409,9 +5412,9 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
int ret = 0; int ret = 0;
u64 last_committed = fs_info->last_trans_committed; u64 last_committed = fs_info->last_trans_committed;
bool log_dentries = false; bool log_dentries = false;
struct inode *orig_inode = inode; struct btrfs_inode *orig_inode = inode;
sb = inode->i_sb; sb = inode->vfs_inode.i_sb;
if (btrfs_test_opt(fs_info, NOTREELOG)) { if (btrfs_test_opt(fs_info, NOTREELOG)) {
ret = 1; ret = 1;
@ -5428,18 +5431,17 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
goto end_no_trans; goto end_no_trans;
} }
if (root != BTRFS_I(inode)->root || if (root != inode->root || btrfs_root_refs(&root->root_item) == 0) {
btrfs_root_refs(&root->root_item) == 0) {
ret = 1; ret = 1;
goto end_no_trans; goto end_no_trans;
} }
ret = check_parent_dirs_for_sync(trans, inode, parent, ret = check_parent_dirs_for_sync(trans, inode, parent, sb,
sb, last_committed); last_committed);
if (ret) if (ret)
goto end_no_trans; goto end_no_trans;
if (btrfs_inode_in_log(BTRFS_I(inode), trans->transid)) { if (btrfs_inode_in_log(inode, trans->transid)) {
ret = BTRFS_NO_LOG_SYNC; ret = BTRFS_NO_LOG_SYNC;
goto end_no_trans; goto end_no_trans;
} }
@ -5448,8 +5450,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
if (ret) if (ret)
goto end_no_trans; goto end_no_trans;
ret = btrfs_log_inode(trans, root, BTRFS_I(inode), inode_only, ret = btrfs_log_inode(trans, root, inode, inode_only, start, end, ctx);
start, end, ctx);
if (ret) if (ret)
goto end_trans; goto end_trans;
@ -5459,14 +5460,14 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
* we can use the last_unlink_trans field to record renames * we can use the last_unlink_trans field to record renames
* and other fun in this file. * and other fun in this file.
*/ */
if (S_ISREG(inode->i_mode) && if (S_ISREG(inode->vfs_inode.i_mode) &&
BTRFS_I(inode)->generation <= last_committed && inode->generation <= last_committed &&
BTRFS_I(inode)->last_unlink_trans <= last_committed) { inode->last_unlink_trans <= last_committed) {
ret = 0; ret = 0;
goto end_trans; goto end_trans;
} }
if (S_ISDIR(inode->i_mode) && ctx && ctx->log_new_dentries) if (S_ISDIR(inode->vfs_inode.i_mode) && ctx && ctx->log_new_dentries)
log_dentries = true; log_dentries = true;
/* /*
@ -5510,7 +5511,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
* but the file inode does not have a matching BTRFS_INODE_REF_KEY item * but the file inode does not have a matching BTRFS_INODE_REF_KEY item
* and has a link count of 2. * and has a link count of 2.
*/ */
if (BTRFS_I(inode)->last_unlink_trans > last_committed) { if (inode->last_unlink_trans > last_committed) {
ret = btrfs_log_all_parents(trans, orig_inode, ctx); ret = btrfs_log_all_parents(trans, orig_inode, ctx);
if (ret) if (ret)
goto end_trans; goto end_trans;
@ -5520,14 +5521,13 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
if (!parent || d_really_is_negative(parent) || sb != parent->d_sb) if (!parent || d_really_is_negative(parent) || sb != parent->d_sb)
break; break;
inode = d_inode(parent); inode = BTRFS_I(d_inode(parent));
if (root != BTRFS_I(inode)->root) if (root != inode->root)
break; break;
if (BTRFS_I(inode)->generation > last_committed) { if (inode->generation > last_committed) {
ret = btrfs_log_inode(trans, root, BTRFS_I(inode), ret = btrfs_log_inode(trans, root, inode,
LOG_INODE_EXISTS, LOG_INODE_EXISTS, 0, LLONG_MAX, ctx);
0, LLONG_MAX, ctx);
if (ret) if (ret)
goto end_trans; goto end_trans;
} }
@ -5539,7 +5539,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
old_parent = parent; old_parent = parent;
} }
if (log_dentries) if (log_dentries)
ret = log_new_dir_dentries(trans, root, BTRFS_I(orig_inode), ctx); ret = log_new_dir_dentries(trans, root, orig_inode, ctx);
else else
ret = 0; ret = 0;
end_trans: end_trans:
@ -5571,8 +5571,8 @@ int btrfs_log_dentry_safe(struct btrfs_trans_handle *trans,
struct dentry *parent = dget_parent(dentry); struct dentry *parent = dget_parent(dentry);
int ret; int ret;
ret = btrfs_log_inode_parent(trans, root, d_inode(dentry), parent, ret = btrfs_log_inode_parent(trans, root, BTRFS_I(d_inode(dentry)),
start, end, 0, ctx); parent, start, end, 0, ctx);
dput(parent); dput(parent);
return ret; return ret;
@ -5834,7 +5834,7 @@ int btrfs_log_new_name(struct btrfs_trans_handle *trans,
(!old_dir || old_dir->logged_trans <= fs_info->last_trans_committed)) (!old_dir || old_dir->logged_trans <= fs_info->last_trans_committed))
return 0; return 0;
return btrfs_log_inode_parent(trans, root, &inode->vfs_inode, parent, 0, return btrfs_log_inode_parent(trans, root, inode, parent, 0,
LLONG_MAX, 1, NULL); LLONG_MAX, 1, NULL);
} }

21
fs/btrfs/volumes.c
View File

@ -1725,7 +1725,7 @@ static int btrfs_add_device(struct btrfs_trans_handle *trans,
* Function to update ctime/mtime for a given device path. * Function to update ctime/mtime for a given device path.
* Mainly used for ctime/mtime based probe like libblkid. * Mainly used for ctime/mtime based probe like libblkid.
*/ */
static void update_dev_time(char *path_name) static void update_dev_time(const char *path_name)
{ {
struct file *filp; struct file *filp;
@ -1851,7 +1851,8 @@ void btrfs_assign_next_active_device(struct btrfs_fs_info *fs_info,
fs_info->fs_devices->latest_bdev = next_device->bdev; fs_info->fs_devices->latest_bdev = next_device->bdev;
} }
int btrfs_rm_device(struct btrfs_fs_info *fs_info, char *device_path, u64 devid) int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path,
u64 devid)
{ {
struct btrfs_device *device; struct btrfs_device *device;
struct btrfs_fs_devices *cur_devices; struct btrfs_fs_devices *cur_devices;
@ -2091,7 +2092,7 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
} }
static int btrfs_find_device_by_path(struct btrfs_fs_info *fs_info, static int btrfs_find_device_by_path(struct btrfs_fs_info *fs_info,
char *device_path, const char *device_path,
struct btrfs_device **device) struct btrfs_device **device)
{ {
int ret = 0; int ret = 0;
@ -2118,7 +2119,7 @@ static int btrfs_find_device_by_path(struct btrfs_fs_info *fs_info,
} }
int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info, int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,
char *device_path, const char *device_path,
struct btrfs_device **device) struct btrfs_device **device)
{ {
*device = NULL; *device = NULL;
@ -2151,7 +2152,8 @@ int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,
* Lookup a device given by device id, or the path if the id is 0. * Lookup a device given by device id, or the path if the id is 0.
*/ */
int btrfs_find_device_by_devspec(struct btrfs_fs_info *fs_info, u64 devid, int btrfs_find_device_by_devspec(struct btrfs_fs_info *fs_info, u64 devid,
char *devpath, struct btrfs_device **device) const char *devpath,
struct btrfs_device **device)
{ {
int ret; int ret;
@ -2307,7 +2309,7 @@ static int btrfs_finish_sprout(struct btrfs_trans_handle *trans,
return ret; return ret;
} }
int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *device_path) int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path)
{ {
struct btrfs_root *root = fs_info->dev_root; struct btrfs_root *root = fs_info->dev_root;
struct request_queue *q; struct request_queue *q;
@ -2515,7 +2517,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *device_path)
} }
int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
char *device_path, const char *device_path,
struct btrfs_device *srcdev, struct btrfs_device *srcdev,
struct btrfs_device **device_out) struct btrfs_device **device_out)
{ {
@ -6954,7 +6956,8 @@ static int update_dev_stat_item(struct btrfs_trans_handle *trans,
key.offset = device->devid; key.offset = device->devid;
path = btrfs_alloc_path(); path = btrfs_alloc_path();
BUG_ON(!path); if (!path)
return -ENOMEM;
ret = btrfs_search_slot(trans, dev_root, &key, path, -1, 1); ret = btrfs_search_slot(trans, dev_root, &key, path, -1, 1);
if (ret < 0) { if (ret < 0) {
btrfs_warn_in_rcu(fs_info, btrfs_warn_in_rcu(fs_info,
@ -7102,7 +7105,7 @@ int btrfs_get_dev_stats(struct btrfs_fs_info *fs_info,
return 0; return 0;
} }
void btrfs_scratch_superblocks(struct block_device *bdev, char *device_path) void btrfs_scratch_superblocks(struct block_device *bdev, const char *device_path)
{ {
struct buffer_head *bh; struct buffer_head *bh;
struct btrfs_super_block *disk_super; struct btrfs_super_block *disk_super;

12
fs/btrfs/volumes.h
View File

@ -422,16 +422,16 @@ void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step);
void btrfs_assign_next_active_device(struct btrfs_fs_info *fs_info, void btrfs_assign_next_active_device(struct btrfs_fs_info *fs_info,
struct btrfs_device *device, struct btrfs_device *this_dev); struct btrfs_device *device, struct btrfs_device *this_dev);
int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info, int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,
char *device_path, const char *device_path,
struct btrfs_device **device); struct btrfs_device **device);
int btrfs_find_device_by_devspec(struct btrfs_fs_info *fs_info, u64 devid, int btrfs_find_device_by_devspec(struct btrfs_fs_info *fs_info, u64 devid,
char *devpath, const char *devpath,
struct btrfs_device **device); struct btrfs_device **device);
struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info, struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,
const u64 *devid, const u64 *devid,
const u8 *uuid); const u8 *uuid);
int btrfs_rm_device(struct btrfs_fs_info *fs_info, int btrfs_rm_device(struct btrfs_fs_info *fs_info,
char *device_path, u64 devid); const char *device_path, u64 devid);
void btrfs_cleanup_fs_uuids(void); void btrfs_cleanup_fs_uuids(void);
int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len); int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len);
int btrfs_grow_device(struct btrfs_trans_handle *trans, int btrfs_grow_device(struct btrfs_trans_handle *trans,
@ -439,9 +439,9 @@ int btrfs_grow_device(struct btrfs_trans_handle *trans,
struct btrfs_device *btrfs_find_device(struct btrfs_fs_info *fs_info, u64 devid, struct btrfs_device *btrfs_find_device(struct btrfs_fs_info *fs_info, u64 devid,
u8 *uuid, u8 *fsid); u8 *uuid, u8 *fsid);
int btrfs_shrink_device(struct btrfs_device *device, u64 new_size); int btrfs_shrink_device(struct btrfs_device *device, u64 new_size);
int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *path); int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *path);
int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
char *device_path, const char *device_path,
struct btrfs_device *srcdev, struct btrfs_device *srcdev,
struct btrfs_device **device_out); struct btrfs_device **device_out);
int btrfs_balance(struct btrfs_balance_control *bctl, int btrfs_balance(struct btrfs_balance_control *bctl,
@ -474,7 +474,7 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
struct btrfs_device *tgtdev); struct btrfs_device *tgtdev);
void btrfs_init_dev_replace_tgtdev_for_resume(struct btrfs_fs_info *fs_info, void btrfs_init_dev_replace_tgtdev_for_resume(struct btrfs_fs_info *fs_info,
struct btrfs_device *tgtdev); struct btrfs_device *tgtdev);
void btrfs_scratch_superblocks(struct block_device *bdev, char *device_path); void btrfs_scratch_superblocks(struct block_device *bdev, const char *device_path);
int btrfs_is_parity_mirror(struct btrfs_mapping_tree *map_tree, int btrfs_is_parity_mirror(struct btrfs_mapping_tree *map_tree,
u64 logical, u64 len, int mirror_num); u64 logical, u64 len, int mirror_num);
unsigned long btrfs_full_stripe_len(struct btrfs_fs_info *fs_info, unsigned long btrfs_full_stripe_len(struct btrfs_fs_info *fs_info,

9
fs/btrfs/zlib.c
View File

@ -73,13 +73,11 @@ static struct list_head *zlib_alloc_workspace(void)
static int zlib_compress_pages(struct list_head *ws, static int zlib_compress_pages(struct list_head *ws,
struct address_space *mapping, struct address_space *mapping,
u64 start, unsigned long len, u64 start,
struct page **pages, struct page **pages,
unsigned long nr_dest_pages,
unsigned long *out_pages, unsigned long *out_pages,
unsigned long *total_in, unsigned long *total_in,
unsigned long *total_out, unsigned long *total_out)
unsigned long max_out)
{ {
struct workspace *workspace = list_entry(ws, struct workspace, list); struct workspace *workspace = list_entry(ws, struct workspace, list);
int ret; int ret;
@ -89,6 +87,9 @@ static int zlib_compress_pages(struct list_head *ws,
struct page *in_page = NULL; struct page *in_page = NULL;
struct page *out_page = NULL; struct page *out_page = NULL;
unsigned long bytes_left; unsigned long bytes_left;
unsigned long len = *total_out;
unsigned long nr_dest_pages = *out_pages;
const unsigned long max_out = nr_dest_pages * PAGE_SIZE;
*out_pages = 0; *out_pages = 0;
*total_out = 0; *total_out = 0;