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

Commit 78609a81 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: (32 commits)
  ocfs2: recover orphans in offline slots during recovery and mount
  ocfs2: Pagecache usage optimization on ocfs2
  ocfs2: fix rare stale inode errors when exporting via nfs
  ocfs2/dlm: Tweak mle_state output
  ocfs2/dlm: Do not purge lockres that is being migrated dlm_purge_lockres()
  ocfs2/dlm: Remove struct dlm_lock_name in struct dlm_master_list_entry
  ocfs2/dlm: Show the number of lockres/mles in dlm_state
  ocfs2/dlm: dlm_set_lockres_owner() and dlm_change_lockres_owner() inlined
  ocfs2/dlm: Improve lockres counts
  ocfs2/dlm: Track number of mles
  ocfs2/dlm: Indent dlm_cleanup_master_list()
  ocfs2/dlm: Activate dlm->master_hash for master list entries
  ocfs2/dlm: Create and destroy the dlm->master_hash
  ocfs2/dlm: Refactor dlm_clean_master_list()
  ocfs2/dlm: Clean up struct dlm_lock_name
  ocfs2/dlm: Encapsulate adding and removing of mle from dlm->master_list
  ocfs2: Optimize inode group allocation by recording last used group.
  ocfs2: Allocate inode groups from global_bitmap.
  ocfs2: Optimize inode allocation by remembering last group
  ocfs2: fix leaf start calculation in ocfs2_dx_dir_rebalance()
  ...
parents 133e2a31 9140db04

fs/ocfs2/alloc.c

+57 −0
Original line number Diff line number Diff line
@@ -294,6 +294,55 @@ static struct ocfs2_extent_tree_operations ocfs2_xattr_tree_et_ops = { 
	.eo_fill_max_leaf_clusters = ocfs2_xattr_tree_fill_max_leaf_clusters,

};



static void ocfs2_dx_root_set_last_eb_blk(struct ocfs2_extent_tree *et,

					  u64 blkno)

{

	struct ocfs2_dx_root_block *dx_root = et->et_object;



	dx_root->dr_last_eb_blk = cpu_to_le64(blkno);

}



static u64 ocfs2_dx_root_get_last_eb_blk(struct ocfs2_extent_tree *et)

{

	struct ocfs2_dx_root_block *dx_root = et->et_object;



	return le64_to_cpu(dx_root->dr_last_eb_blk);

}



static void ocfs2_dx_root_update_clusters(struct inode *inode,

					  struct ocfs2_extent_tree *et,

					  u32 clusters)

{

	struct ocfs2_dx_root_block *dx_root = et->et_object;



	le32_add_cpu(&dx_root->dr_clusters, clusters);

}



static int ocfs2_dx_root_sanity_check(struct inode *inode,

				      struct ocfs2_extent_tree *et)

{

	struct ocfs2_dx_root_block *dx_root = et->et_object;



	BUG_ON(!OCFS2_IS_VALID_DX_ROOT(dx_root));



	return 0;

}



static void ocfs2_dx_root_fill_root_el(struct ocfs2_extent_tree *et)

{

	struct ocfs2_dx_root_block *dx_root = et->et_object;



	et->et_root_el = &dx_root->dr_list;

}



static struct ocfs2_extent_tree_operations ocfs2_dx_root_et_ops = {

	.eo_set_last_eb_blk	= ocfs2_dx_root_set_last_eb_blk,

	.eo_get_last_eb_blk	= ocfs2_dx_root_get_last_eb_blk,

	.eo_update_clusters	= ocfs2_dx_root_update_clusters,

	.eo_sanity_check	= ocfs2_dx_root_sanity_check,

	.eo_fill_root_el	= ocfs2_dx_root_fill_root_el,

};



static void __ocfs2_init_extent_tree(struct ocfs2_extent_tree *et,

				     struct inode *inode,

				     struct buffer_head *bh,
@@ -339,6 +388,14 @@ void ocfs2_init_xattr_value_extent_tree(struct ocfs2_extent_tree *et, 
				 &ocfs2_xattr_value_et_ops);

}



void ocfs2_init_dx_root_extent_tree(struct ocfs2_extent_tree *et,

				    struct inode *inode,

				    struct buffer_head *bh)

{

	__ocfs2_init_extent_tree(et, inode, bh, ocfs2_journal_access_dr,

				 NULL, &ocfs2_dx_root_et_ops);

}



static inline void ocfs2_et_set_last_eb_blk(struct ocfs2_extent_tree *et,

					    u64 new_last_eb_blk)

{

fs/ocfs2/alloc.h

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ struct ocfs2_xattr_value_buf; 
void ocfs2_init_xattr_value_extent_tree(struct ocfs2_extent_tree *et,

					struct inode *inode,

					struct ocfs2_xattr_value_buf *vb);

void ocfs2_init_dx_root_extent_tree(struct ocfs2_extent_tree *et,

				    struct inode *inode,

				    struct buffer_head *bh);



/*

 * Read an extent block into *bh.  If *bh is NULL, a bh will be

fs/ocfs2/aops.c

+12 −11
Original line number Diff line number Diff line
@@ -1967,4 +1967,5 @@ const struct address_space_operations ocfs2_aops = { 
	.invalidatepage		= ocfs2_invalidatepage,

	.releasepage		= ocfs2_releasepage,

	.migratepage		= buffer_migrate_page,

	.is_partially_uptodate	= block_is_partially_uptodate,

};

fs/ocfs2/cluster/heartbeat.c

+95 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/random.h>

#include <linux/crc32.h>

#include <linux/time.h>

#include <linux/debugfs.h>



#include "heartbeat.h"

#include "tcp.h"
@@ -60,6 +61,11 @@ static unsigned long o2hb_live_node_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)]; 
static LIST_HEAD(o2hb_node_events);

static DECLARE_WAIT_QUEUE_HEAD(o2hb_steady_queue);



#define O2HB_DEBUG_DIR			"o2hb"

#define O2HB_DEBUG_LIVENODES		"livenodes"

static struct dentry *o2hb_debug_dir;

static struct dentry *o2hb_debug_livenodes;



static LIST_HEAD(o2hb_all_regions);



static struct o2hb_callback {
@@ -905,7 +911,77 @@ static int o2hb_thread(void *data) 
	return 0;

}



void o2hb_init(void)

#ifdef CONFIG_DEBUG_FS

static int o2hb_debug_open(struct inode *inode, struct file *file)

{

	unsigned long map[BITS_TO_LONGS(O2NM_MAX_NODES)];

	char *buf = NULL;

	int i = -1;

	int out = 0;



	buf = kmalloc(PAGE_SIZE, GFP_KERNEL);

	if (!buf)

		goto bail;



	o2hb_fill_node_map(map, sizeof(map));



	while ((i = find_next_bit(map, O2NM_MAX_NODES, i + 1)) < O2NM_MAX_NODES)

		out += snprintf(buf + out, PAGE_SIZE - out, "%d ", i);

	out += snprintf(buf + out, PAGE_SIZE - out, "\n");



	i_size_write(inode, out);



	file->private_data = buf;



	return 0;

bail:

	return -ENOMEM;

}



static int o2hb_debug_release(struct inode *inode, struct file *file)

{

	kfree(file->private_data);

	return 0;

}



static ssize_t o2hb_debug_read(struct file *file, char __user *buf,

				 size_t nbytes, loff_t *ppos)

{

	return simple_read_from_buffer(buf, nbytes, ppos, file->private_data,

				       i_size_read(file->f_mapping->host));

}

#else

static int o2hb_debug_open(struct inode *inode, struct file *file)

{

	return 0;

}

static int o2hb_debug_release(struct inode *inode, struct file *file)

{

	return 0;

}

static ssize_t o2hb_debug_read(struct file *file, char __user *buf,

			       size_t nbytes, loff_t *ppos)

{

	return 0;

}

#endif  /* CONFIG_DEBUG_FS */



static struct file_operations o2hb_debug_fops = {

	.open =		o2hb_debug_open,

	.release =	o2hb_debug_release,

	.read =		o2hb_debug_read,

	.llseek =	generic_file_llseek,

};



void o2hb_exit(void)

{

	if (o2hb_debug_livenodes)

		debugfs_remove(o2hb_debug_livenodes);

	if (o2hb_debug_dir)

		debugfs_remove(o2hb_debug_dir);

}



int o2hb_init(void)

{

	int i;
@@ -918,6 +994,24 @@ void o2hb_init(void) 
	INIT_LIST_HEAD(&o2hb_node_events);



	memset(o2hb_live_node_bitmap, 0, sizeof(o2hb_live_node_bitmap));



	o2hb_debug_dir = debugfs_create_dir(O2HB_DEBUG_DIR, NULL);

	if (!o2hb_debug_dir) {

		mlog_errno(-ENOMEM);

		return -ENOMEM;

	}



	o2hb_debug_livenodes = debugfs_create_file(O2HB_DEBUG_LIVENODES,

						   S_IFREG|S_IRUSR,

						   o2hb_debug_dir, NULL,

						   &o2hb_debug_fops);

	if (!o2hb_debug_livenodes) {

		mlog_errno(-ENOMEM);

		debugfs_remove(o2hb_debug_dir);

		return -ENOMEM;

	}



	return 0;

}



/* if we're already in a callback then we're already serialized by the sem */

fs/ocfs2/cluster/heartbeat.h

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ void o2hb_unregister_callback(const char *region_uuid, 
			      struct o2hb_callback_func *hc);

void o2hb_fill_node_map(unsigned long *map,

			unsigned bytes);

void o2hb_init(void);

void o2hb_exit(void);

int o2hb_init(void);

int o2hb_check_node_heartbeating(u8 node_num);

int o2hb_check_node_heartbeating_from_callback(u8 node_num);

int o2hb_check_local_node_heartbeating(void);