Commit 03e62303 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: (47 commits)
  ocfs2: Silence a gcc warning.
  ocfs2: Don't retry xattr set in case value extension fails.
  ocfs2:dlm: avoid dlm->ast_lock lockres->spinlock dependency break
  ocfs2: Reset xattr value size after xa_cleanup_value_truncate().
  fs/ocfs2/dlm: Use kstrdup
  fs/ocfs2/dlm: Drop memory allocation cast
  Ocfs2: Optimize punching-hole code.
  Ocfs2: Make ocfs2_find_cpos_for_left_leaf() public.
  Ocfs2: Fix hole punching to correctly do CoW during cluster zeroing.
  Ocfs2: Optimize ocfs2 truncate to use ocfs2_remove_btree_range() instead.
  ocfs2: Block signals for mkdir/link/symlink/O_CREAT.
  ocfs2: Wrap signal blocking in void functions.
  ocfs2/dlm: Increase o2dlm lockres hash size
  ocfs2: Make ocfs2_extend_trans() really extend.
  ocfs2/trivial: Code cleanup for allocation reservation.
  ocfs2: make ocfs2_adjust_resv_from_alloc simple.
  ocfs2: Make nointr a default mount option
  ocfs2/dlm: Make o2dlm domain join/leave messages KERN_NOTICE
  o2net: log socket state changes
  ocfs2: print node # when tcp fails
  ...
parents 33cf23b0 18d3a98f

Documentation/filesystems/ocfs2.txt

+7 −0
Original line number Diff line number Diff line
@@ -80,3 +80,10 @@ user_xattr (*) Enables Extended User Attributes. 
nouser_xattr		Disables Extended User Attributes.

acl			Enables POSIX Access Control Lists support.

noacl		(*)	Disables POSIX Access Control Lists support.

resv_level=2	(*)	Set how agressive allocation reservations will be.

			Valid values are between 0 (reservations off) to 8

			(maximum space for reservations).

dir_resv_level=	(*)	By default, directory reservations will scale with file

			reservations - users should rarely need to change this

			value. If allocation reservations are turned off, this

			option will have no effect.

fs/ocfs2/Makefile

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

	namei.o 		\

	refcounttree.o		\

	reservations.o		\

	resize.o		\

	slot_map.o 		\

	suballoc.o 		\

fs/ocfs2/alloc.c

+219 −689

File changed.

Preview size limit exceeded, changes collapsed.

fs/ocfs2/alloc.h

+7 −5
Original line number Diff line number Diff line
@@ -140,8 +140,9 @@ int ocfs2_remove_extent(handle_t *handle, struct ocfs2_extent_tree *et, 
			struct ocfs2_cached_dealloc_ctxt *dealloc);

int ocfs2_remove_btree_range(struct inode *inode,

			     struct ocfs2_extent_tree *et,

			     u32 cpos, u32 phys_cpos, u32 len,

			     struct ocfs2_cached_dealloc_ctxt *dealloc);

			     u32 cpos, u32 phys_cpos, u32 len, int flags,

			     struct ocfs2_cached_dealloc_ctxt *dealloc,

			     u64 refcount_loc);



int ocfs2_num_free_extents(struct ocfs2_super *osb,

			   struct ocfs2_extent_tree *et);
@@ -209,7 +210,7 @@ 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,

			      int type, int slot, u64 suballoc, u64 blkno,

			      unsigned int bit);

static inline int ocfs2_dealloc_has_cluster(struct ocfs2_cached_dealloc_ctxt *c)

{
@@ -233,8 +234,7 @@ int ocfs2_prepare_truncate(struct ocfs2_super *osb, 
			   struct ocfs2_truncate_context **tc);

int ocfs2_commit_truncate(struct ocfs2_super *osb,

			  struct inode *inode,

			  struct buffer_head *fe_bh,

			  struct ocfs2_truncate_context *tc);

			  struct buffer_head *di_bh);

int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh,

			  unsigned int start, unsigned int end, int trunc);
@@ -319,6 +319,8 @@ int ocfs2_journal_access_path(struct ocfs2_caching_info *ci, 
			      struct ocfs2_path *path);

int ocfs2_find_cpos_for_right_leaf(struct super_block *sb,

				   struct ocfs2_path *path, u32 *cpos);

int ocfs2_find_cpos_for_left_leaf(struct super_block *sb,

				  struct ocfs2_path *path, u32 *cpos);

int ocfs2_find_subtree_root(struct ocfs2_extent_tree *et,

			    struct ocfs2_path *left,

			    struct ocfs2_path *right);

fs/ocfs2/aops.c

+3 −0
Original line number Diff line number Diff line
@@ -1735,6 +1735,9 @@ int ocfs2_write_begin_nolock(struct address_space *mapping, 
			goto out;

		}



		if (data_ac)

			data_ac->ac_resv = &OCFS2_I(inode)->ip_la_data_resv;



		credits = ocfs2_calc_extend_credits(inode->i_sb,

						    &di->id2.i_list,

						    clusters_to_alloc);

CRA Git | Maintained and supported by SUSTech CRA and CCSE