Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6973aa6 authored by Li Zefan's avatar Li Zefan Committed by Chris Mason
Browse files

Btrfs: fix readahead in file defrag 



We passed the wrong value to btrfs_force_ra(). Fix this by changing
the argument of btrfs_force_ra() from last_index to nr_page.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent b532402e

fs/btrfs/ctree.h

+8 −3
Original line number Original line Diff line number Diff line
@@ -2520,6 +2520,14 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end, 
#define PageChecked PageFsMisc

#define PageChecked PageFsMisc

#endif

#endif





/* This forces readahead on a given range of bytes in an inode */

static inline void btrfs_force_ra(struct address_space *mapping,

				  struct file_ra_state *ra, struct file *file,

				  pgoff_t offset, unsigned long req_size)

{

	page_cache_sync_readahead(mapping, ra, file, offset, req_size);

}



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 inode *dir, u64 *index);

int btrfs_unlink_inode(struct btrfs_trans_handle *trans,

int btrfs_unlink_inode(struct btrfs_trans_handle *trans,
@@ -2548,9 +2556,6 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans, 
int btrfs_merge_bio_hook(struct page *page, unsigned long offset,

int btrfs_merge_bio_hook(struct page *page, unsigned long offset,

			 size_t size, struct bio *bio, unsigned long bio_flags);

			 size_t size, struct bio *bio, unsigned long bio_flags);





unsigned long btrfs_force_ra(struct address_space *mapping,

			      struct file_ra_state *ra, struct file *file,

			      pgoff_t offset, pgoff_t last_index);

int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);

int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);

int btrfs_readpage(struct file *file, struct page *page);

int btrfs_readpage(struct file *file, struct page *page);

void btrfs_evict_inode(struct inode *inode);

void btrfs_evict_inode(struct inode *inode);

fs/btrfs/inode.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -6697,19 +6697,6 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans, 
	return 0;

	return 0;

}

}





/* helper function for file defrag and space balancing.  This

 * forces readahead on a given range of bytes in an inode

 */

unsigned long btrfs_force_ra(struct address_space *mapping,

			      struct file_ra_state *ra, struct file *file,

			      pgoff_t offset, pgoff_t last_index)

{

	pgoff_t req_size = last_index - offset + 1;



	page_cache_sync_readahead(mapping, ra, file, offset, req_size);

	return offset + req_size;

}



struct inode *btrfs_alloc_inode(struct super_block *sb)

struct inode *btrfs_alloc_inode(struct super_block *sb)

{

{

	struct btrfs_inode *ei;

	struct btrfs_inode *ei;