Commit b64ada6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (85 commits)
  ocfs2: Use buffer IO if we are appending a file.
  ocfs2: add spinlock protection when dealing with lockres->purge.
  dlmglue.c: add missed mlog lines
  ocfs2: __ocfs2_abort() should not enable panic for local mounts
  ocfs2: Add ioctl for reflink.
  ocfs2: Enable refcount tree support.
  ocfs2: Implement ocfs2_reflink.
  ocfs2: Add preserve to reflink.
  ocfs2: Create reflinked file in orphan dir.
  ocfs2: Use proper parameter for some inode operation.
  ocfs2: Make transaction extend more efficient.
  ocfs2: Don't merge in 1st refcount ops of reflink.
  ocfs2: Modify removing xattr process for refcount.
  ocfs2: Add reflink support for xattr.
  ocfs2: Create an xattr indexed block if needed.
  ocfs2: Call refcount tree remove process properly.
  ocfs2: Attach xattr clusters to refcount tree.
  ocfs2: Abstract ocfs2 xattr tree extend rec iteration process.
  ocfs2: Abstract the creation of xattr block.
  ocfs2: Remove inode from ocfs2_xattr_bucket_get_name_value.
  ...
parents be90a49c b80474b4

fs/ocfs2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ ocfs2-objs := \ 
	locks.o			\

	mmap.o 			\

	namei.o 		\

	refcounttree.o		\

	resize.o		\

	slot_map.o 		\

	suballoc.o 		\

fs/ocfs2/alloc.c

+770 −572

File changed.

Preview size limit exceeded, changes collapsed.

fs/ocfs2/alloc.h

+82 −19
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ 
 *

 * ocfs2_extent_tree contains info for the root of the b-tree, it must have a

 * root ocfs2_extent_list and a root_bh so that they can be used in the b-tree

 * functions.  With metadata ecc, we now call different journal_access

 * functions.  It needs the ocfs2_caching_info structure associated with

 * I/O on the tree.  With metadata ecc, we now call different journal_access

 * functions for each type of metadata, so it must have the

 * root_journal_access function.

 * ocfs2_extent_tree_operations abstract the normal operations we do for
@@ -56,6 +57,7 @@ struct ocfs2_extent_tree { 
	struct ocfs2_extent_tree_operations	*et_ops;

	struct buffer_head			*et_root_bh;

	struct ocfs2_extent_list		*et_root_el;

	struct ocfs2_caching_info		*et_ci;

	ocfs2_journal_access_func		et_root_journal_access;

	void					*et_object;

	unsigned int				et_max_leaf_clusters;
@@ -66,17 +68,20 @@ struct ocfs2_extent_tree { 
 * specified object buffer.

 */

void ocfs2_init_dinode_extent_tree(struct ocfs2_extent_tree *et,

				   struct inode *inode,

				   struct ocfs2_caching_info *ci,

				   struct buffer_head *bh);

void ocfs2_init_xattr_tree_extent_tree(struct ocfs2_extent_tree *et,

				       struct inode *inode,

				       struct ocfs2_caching_info *ci,

				       struct buffer_head *bh);

struct ocfs2_xattr_value_buf;

void ocfs2_init_xattr_value_extent_tree(struct ocfs2_extent_tree *et,

					struct inode *inode,

					struct ocfs2_caching_info *ci,

					struct ocfs2_xattr_value_buf *vb);

void ocfs2_init_dx_root_extent_tree(struct ocfs2_extent_tree *et,

				    struct inode *inode,

				    struct ocfs2_caching_info *ci,

				    struct buffer_head *bh);

void ocfs2_init_refcount_extent_tree(struct ocfs2_extent_tree *et,

				     struct ocfs2_caching_info *ci,

				     struct buffer_head *bh);



/*
@@ -84,13 +89,11 @@ void ocfs2_init_dx_root_extent_tree(struct ocfs2_extent_tree *et, 
 * allocated.  This is a cached read.  The extent block will be validated

 * with ocfs2_validate_extent_block().

 */

int ocfs2_read_extent_block(struct inode *inode, u64 eb_blkno,

int ocfs2_read_extent_block(struct ocfs2_caching_info *ci, u64 eb_blkno,

			    struct buffer_head **bh);



struct ocfs2_alloc_context;

int ocfs2_insert_extent(struct ocfs2_super *osb,

			handle_t *handle,

			struct inode *inode,

int ocfs2_insert_extent(handle_t *handle,

			struct ocfs2_extent_tree *et,

			u32 cpos,

			u64 start_blk,
@@ -103,25 +106,36 @@ enum ocfs2_alloc_restarted { 
	RESTART_TRANS,

	RESTART_META

};

int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb,

				struct inode *inode,

int ocfs2_add_clusters_in_btree(handle_t *handle,

				struct ocfs2_extent_tree *et,

				u32 *logical_offset,

				u32 clusters_to_add,

				int mark_unwritten,

				struct ocfs2_extent_tree *et,

				handle_t *handle,

				struct ocfs2_alloc_context *data_ac,

				struct ocfs2_alloc_context *meta_ac,

				enum ocfs2_alloc_restarted *reason_ret);

struct ocfs2_cached_dealloc_ctxt;

struct ocfs2_path;

int ocfs2_split_extent(handle_t *handle,

		       struct ocfs2_extent_tree *et,

		       struct ocfs2_path *path,

		       int split_index,

		       struct ocfs2_extent_rec *split_rec,

		       struct ocfs2_alloc_context *meta_ac,

		       struct ocfs2_cached_dealloc_ctxt *dealloc);

int ocfs2_mark_extent_written(struct inode *inode,

			      struct ocfs2_extent_tree *et,

			      handle_t *handle, u32 cpos, u32 len, u32 phys,

			      struct ocfs2_alloc_context *meta_ac,

			      struct ocfs2_cached_dealloc_ctxt *dealloc);

int ocfs2_remove_extent(struct inode *inode,

int ocfs2_change_extent_flag(handle_t *handle,

			     struct ocfs2_extent_tree *et,

			u32 cpos, u32 len, handle_t *handle,

			     u32 cpos, u32 len, u32 phys,

			     struct ocfs2_alloc_context *meta_ac,

			     struct ocfs2_cached_dealloc_ctxt *dealloc,

			     int new_flags, int clear_flags);

int ocfs2_remove_extent(handle_t *handle, struct ocfs2_extent_tree *et,

			u32 cpos, u32 len,

			struct ocfs2_alloc_context *meta_ac,

			struct ocfs2_cached_dealloc_ctxt *dealloc);

int ocfs2_remove_btree_range(struct inode *inode,
@@ -130,7 +144,6 @@ int ocfs2_remove_btree_range(struct inode *inode, 
			     struct ocfs2_cached_dealloc_ctxt *dealloc);



int ocfs2_num_free_extents(struct ocfs2_super *osb,

			   struct inode *inode,

			   struct ocfs2_extent_tree *et);



/*
@@ -195,6 +208,9 @@ static inline void ocfs2_init_dealloc_ctxt(struct ocfs2_cached_dealloc_ctxt *c) 
}

int ocfs2_cache_cluster_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt,

				u64 blkno, unsigned int bit);

int ocfs2_cache_block_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt,

			      int type, int slot, u64 blkno,

			      unsigned int bit);

static inline int ocfs2_dealloc_has_cluster(struct ocfs2_cached_dealloc_ctxt *c)

{

	return c->c_global_allocator != NULL;
@@ -222,8 +238,9 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb, 
int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh,

			  unsigned int start, unsigned int end, int trunc);



int ocfs2_find_leaf(struct inode *inode, struct ocfs2_extent_list *root_el,

		    u32 cpos, struct buffer_head **leaf_bh);

int ocfs2_find_leaf(struct ocfs2_caching_info *ci,

		    struct ocfs2_extent_list *root_el, u32 cpos,

		    struct buffer_head **leaf_bh);

int ocfs2_search_extent_list(struct ocfs2_extent_list *el, u32 v_cluster);



/*
@@ -254,4 +271,50 @@ static inline int ocfs2_is_empty_extent(struct ocfs2_extent_rec *rec) 
	return !rec->e_leaf_clusters;

}



int ocfs2_grab_pages(struct inode *inode, loff_t start, loff_t end,

		     struct page **pages, int *num);

void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,

			      unsigned int from, unsigned int to,

			      struct page *page, int zero, u64 *phys);

/*

 * Structures which describe a path through a btree, and functions to

 * manipulate them.

 *

 * The idea here is to be as generic as possible with the tree

 * manipulation code.

 */

struct ocfs2_path_item {

	struct buffer_head		*bh;

	struct ocfs2_extent_list	*el;

};



#define OCFS2_MAX_PATH_DEPTH	5



struct ocfs2_path {

	int				p_tree_depth;

	ocfs2_journal_access_func	p_root_access;

	struct ocfs2_path_item		p_node[OCFS2_MAX_PATH_DEPTH];

};



#define path_root_bh(_path) ((_path)->p_node[0].bh)

#define path_root_el(_path) ((_path)->p_node[0].el)

#define path_root_access(_path)((_path)->p_root_access)

#define path_leaf_bh(_path) ((_path)->p_node[(_path)->p_tree_depth].bh)

#define path_leaf_el(_path) ((_path)->p_node[(_path)->p_tree_depth].el)

#define path_num_items(_path) ((_path)->p_tree_depth + 1)



void ocfs2_reinit_path(struct ocfs2_path *path, int keep_root);

void ocfs2_free_path(struct ocfs2_path *path);

int ocfs2_find_path(struct ocfs2_caching_info *ci,

		    struct ocfs2_path *path,

		    u32 cpos);

struct ocfs2_path *ocfs2_new_path_from_path(struct ocfs2_path *path);

struct ocfs2_path *ocfs2_new_path_from_et(struct ocfs2_extent_tree *et);

int ocfs2_path_bh_journal_access(handle_t *handle,

				 struct ocfs2_caching_info *ci,

				 struct ocfs2_path *path,

				 int idx);

int ocfs2_journal_access_path(struct ocfs2_caching_info *ci,

			      handle_t *handle,

			      struct ocfs2_path *path);

#endif /* OCFS2_ALLOC_H */

fs/ocfs2/aops.c

+31 −6
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "suballoc.h"

#include "super.h"

#include "symlink.h"

#include "refcounttree.h"



#include "buffer_head_io.h"
@@ -126,7 +127,7 @@ bail: 
	return err;

}



static int ocfs2_get_block(struct inode *inode, sector_t iblock,

int ocfs2_get_block(struct inode *inode, sector_t iblock,

		    struct buffer_head *bh_result, int create)

{

	int err = 0;
@@ -590,6 +591,8 @@ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock, 
		goto bail;

	}



	/* We should already CoW the refcounted extent. */

	BUG_ON(ext_flags & OCFS2_EXT_REFCOUNTED);

	/*

	 * get_more_blocks() expects us to describe a hole by clearing

	 * the mapped bit on bh_result().
@@ -687,6 +690,10 @@ static ssize_t ocfs2_direct_IO(int rw, 
	if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL)

		return 0;



	/* Fallback to buffered I/O if we are appending. */

	if (i_size_read(inode) <= offset)

		return 0;



	ret = blockdev_direct_IO_no_locking(rw, iocb, inode,

					    inode->i_sb->s_bdev, iov, offset,

					    nr_segs,
@@ -1259,7 +1266,8 @@ static int ocfs2_write_cluster(struct address_space *mapping, 
			goto out;

		}

	} else if (unwritten) {

		ocfs2_init_dinode_extent_tree(&et, inode, wc->w_di_bh);

		ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode),

					      wc->w_di_bh);

		ret = ocfs2_mark_extent_written(inode, &et,

						wc->w_handle, cpos, 1, phys,

						meta_ac, &wc->w_dealloc);
@@ -1448,6 +1456,9 @@ static int ocfs2_populate_write_desc(struct inode *inode, 
				goto out;

			}



			/* We should already CoW the refcountd extent. */

			BUG_ON(ext_flags & OCFS2_EXT_REFCOUNTED);



			/*

			 * Assume worst case - that we're writing in

			 * the middle of the extent.
@@ -1528,7 +1539,7 @@ static int ocfs2_write_begin_inline(struct address_space *mapping, 
		goto out;

	}



	ret = ocfs2_journal_access_di(handle, inode, wc->w_di_bh,

	ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc->w_di_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		ocfs2_commit_trans(osb, handle);
@@ -1699,6 +1710,19 @@ int ocfs2_write_begin_nolock(struct address_space *mapping, 
		goto out;

	}



	ret = ocfs2_check_range_for_refcount(inode, pos, len);

	if (ret < 0) {

		mlog_errno(ret);

		goto out;

	} else if (ret == 1) {

		ret = ocfs2_refcount_cow(inode, di_bh,

					 wc->w_cpos, wc->w_clen, UINT_MAX);

		if (ret) {

			mlog_errno(ret);

			goto out;

		}

	}



	ret = ocfs2_populate_write_desc(inode, wc, &clusters_to_alloc,

					&extents_to_split);

	if (ret) {
@@ -1726,7 +1750,8 @@ int ocfs2_write_begin_nolock(struct address_space *mapping, 
		     (long long)i_size_read(inode), le32_to_cpu(di->i_clusters),

		     clusters_to_alloc, extents_to_split);



		ocfs2_init_dinode_extent_tree(&et, inode, wc->w_di_bh);

		ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode),

					      wc->w_di_bh);

		ret = ocfs2_lock_allocators(inode, &et,

					    clusters_to_alloc, extents_to_split,

					    &data_ac, &meta_ac);
@@ -1773,7 +1798,7 @@ int ocfs2_write_begin_nolock(struct address_space *mapping, 
	 * We don't want this to fail in ocfs2_write_end(), so do it

	 * here.

	 */

	ret = ocfs2_journal_access_di(handle, inode, wc->w_di_bh,

	ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc->w_di_bh,

				      OCFS2_JOURNAL_ACCESS_WRITE);

	if (ret) {

		mlog_errno(ret);

fs/ocfs2/aops.h

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page, 
			   struct buffer_head *di_bh);

int ocfs2_size_fits_inline_data(struct buffer_head *di_bh, u64 new_size);



int ocfs2_get_block(struct inode *inode, sector_t iblock,

		    struct buffer_head *bh_result, int create);

/* all ocfs2_dio_end_io()'s fault */

#define ocfs2_iocb_is_rw_locked(iocb) \

	test_bit(0, (unsigned long *)&iocb->private)

CRA Git | Maintained and supported by SUSTech CRA and CCSE