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

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

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (27 commits)
  ocfs2: Cache extent records
  ocfs2: Remember rw lock level during direct io
  ocfs2: Fix up i_blocks calculation to know about holes
  ocfs2: Fix extent lookup to return true size of holes
  ocfs2: Read from an unwritten extent returns zeros
  ocfs2: make room for unwritten extents flag
  ocfs2: Use own splice write actor
  ocfs2: Use do_sync_mapping_range() in ocfs2_zero_tail_for_truncate()
  [PATCH] Turn do_sync_file_range() into do_sync_mapping_range()
  ocfs2: zero tail of sparse files on truncate
  ocfs2: Teach ocfs2_get_block() about holes
  ocfs2: remove ocfs2_prepare_write() and ocfs2_commit_write()
  ocfs2: teach ocfs2_file_aio_write() about sparse files
  ocfs2: Turn off shared writeable mmap for local files systems with holes.
  ocfs2: abstract out allocation locking
  ocfs2: teach extend/truncate about sparse files
  ocfs2: temporarily remove extent map caching
  ocfs2: sparse b-tree support
  ocfs2: small cleanup of ocfs2_request_delete()
  ocfs2: remove unused code
  ...
parents c58b8e4a 83418978

fs/ocfs2/alloc.c

+2452 −599

File changed.

Preview size limit exceeded, changes collapsed.

fs/ocfs2/alloc.h

+26 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ int ocfs2_insert_extent(struct ocfs2_super *osb, 
			handle_t *handle,

			struct inode *inode,

			struct buffer_head *fe_bh,

			u64 blkno,

			u32 cpos,

			u64 start_blk,

			u32 new_clusters,

			struct ocfs2_alloc_context *meta_ac);

int ocfs2_num_free_extents(struct ocfs2_super *osb,
@@ -70,6 +71,8 @@ struct ocfs2_truncate_context { 
	struct buffer_head *tc_last_eb_bh;

};



int ocfs2_zero_tail_for_truncate(struct inode *inode, handle_t *handle,

				 u64 new_i_size);

int ocfs2_prepare_truncate(struct ocfs2_super *osb,

			   struct inode *inode,

			   struct buffer_head *fe_bh,
@@ -79,4 +82,26 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb, 
			  struct buffer_head *fe_bh,

			  struct ocfs2_truncate_context *tc);



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

		    u32 cpos, struct buffer_head **leaf_bh);



/*

 * Helper function to look at the # of clusters in an extent record.

 */

static inline unsigned int ocfs2_rec_clusters(struct ocfs2_extent_list *el,

					      struct ocfs2_extent_rec *rec)

{

	/*

	 * Cluster count in extent records is slightly different

	 * between interior nodes and leaf nodes. This is to support

	 * unwritten extents which need a flags field in leaf node

	 * records, thus shrinking the available space for a clusters

	 * field.

	 */

	if (el->l_tree_depth)

		return le32_to_cpu(rec->e_int_clusters);

	else

		return le16_to_cpu(rec->e_leaf_clusters);

}



#endif /* OCFS2_ALLOC_H */

fs/ocfs2/aops.c

+820 −191

File changed.

Preview size limit exceeded, changes collapsed.

fs/ocfs2/aops.h

+74 −3
Original line number Diff line number Diff line
@@ -30,12 +30,83 @@ handle_t *ocfs2_start_walk_page_trans(struct inode *inode, 
							 unsigned from,

							 unsigned to);



int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno,

			  struct inode *inode, unsigned int from,

			  unsigned int to, int new);



int walk_page_buffers(	handle_t *handle,

			struct buffer_head *head,

			unsigned from,

			unsigned to,

			int *partial,

			int (*fn)(	handle_t *handle,

					struct buffer_head *bh));



struct ocfs2_write_ctxt;

typedef int (ocfs2_page_writer)(struct inode *, struct ocfs2_write_ctxt *,

				u64 *, unsigned int *, unsigned int *);



ssize_t ocfs2_buffered_write_cluster(struct file *file, loff_t pos,

				     size_t count, ocfs2_page_writer *actor,

				     void *priv);



struct ocfs2_write_ctxt {

	size_t				w_count;

	loff_t				w_pos;

	u32				w_cpos;

	unsigned int			w_finished_copy;



	/* This is true if page_size > cluster_size */

	unsigned int			w_large_pages;



	/* Filler callback and private data */

	ocfs2_page_writer		*w_write_data_page;

	void				*w_private;



	/* Only valid for the filler callback */

	struct page			*w_this_page;

	unsigned int			w_this_page_new;

};



struct ocfs2_buffered_write_priv {

	char				*b_src_buf;

	const struct iovec		*b_cur_iov; /* Current iovec */

	size_t				b_cur_off; /* Offset in the

						    * current iovec */

};

int ocfs2_map_and_write_user_data(struct inode *inode,

				  struct ocfs2_write_ctxt *wc,

				  u64 *p_blkno,

				  unsigned int *ret_from,

				  unsigned int *ret_to);



struct ocfs2_splice_write_priv {

	struct splice_desc		*s_sd;

	struct pipe_buffer		*s_buf;

	struct pipe_inode_info		*s_pipe;

	/* Neither offset value is ever larger than one page */

	unsigned int			s_offset;

	unsigned int			s_buf_offset;

};

int ocfs2_map_and_write_splice_data(struct inode *inode,

				    struct ocfs2_write_ctxt *wc,

				    u64 *p_blkno,

				    unsigned int *ret_from,

				    unsigned int *ret_to);



/* all ocfs2_dio_end_io()'s fault */

#define ocfs2_iocb_is_rw_locked(iocb) \

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

#define ocfs2_iocb_set_rw_locked(iocb) \

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

static inline void ocfs2_iocb_set_rw_locked(struct kiocb *iocb, int level)

{

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

	if (level)

		set_bit(1, (unsigned long *)&iocb->private);

	else

		clear_bit(1, (unsigned long *)&iocb->private);

}

#define ocfs2_iocb_clear_rw_locked(iocb) \

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



#define ocfs2_iocb_rw_locked_level(iocb) \

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

#endif /* OCFS2_FILE_H */

fs/ocfs2/cluster/quorum.c

+4 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/workqueue.h>

#include <linux/reboot.h>



#include "heartbeat.h"

#include "nodemanager.h"
@@ -72,7 +73,9 @@ static void o2quo_fence_self(void) 
	/* panic spins with interrupts enabled.  with preempt

	 * threads can still schedule, etc, etc */

	o2hb_stop_all_regions();

	panic("ocfs2 is very sorry to be fencing this system by panicing\n");



	printk("ocfs2 is very sorry to be fencing this system by restarting\n");

	emergency_restart();

}



/* Indicate that a timeout occured on a hearbeat region write. The