Commit 501b7c77 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:
  ocfs2: remove redundant NULL checks in ocfs2_direct_IO_get_blocks()
  ocfs2: clean up some osb fields
  ocfs2: fix init of uuid_net_key
  ocfs2: silence a debug print
  ocfs2: silence ENOENT during lookup of broken links
  ocfs2: Cleanup message prints
  ocfs2: silence -EEXIST from ocfs2_extent_map_insert/lookup
  [PATCH] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() static
  ocfs2: warn the user on a dead timeout mismatch
  ocfs2: OCFS2_FS must depend on SYSFS
  ocfs2: Compile-time disabling of ocfs2 debugging output.
  configfs: Clear up a few extra spaces where there should be TABs.
  configfs: Release memory in configfs_example.
parents 74e651f0 184d7d20

Documentation/filesystems/configfs/configfs_example.c

+15 −4
Original line number Diff line number Diff line
@@ -264,6 +264,15 @@ static struct config_item_type simple_child_type = { 
};





struct simple_children {

	struct config_group group;

};



static inline struct simple_children *to_simple_children(struct config_item *item)

{

	return item ? container_of(to_config_group(item), struct simple_children, group) : NULL;

}



static struct config_item *simple_children_make_item(struct config_group *group, const char *name)

{

	struct simple_child *simple_child;
@@ -304,7 +313,13 @@ static ssize_t simple_children_attr_show(struct config_item *item, 
"items have only one attribute that is readable and writeable.\n");

}



static void simple_children_release(struct config_item *item)

{

	kfree(to_simple_children(item));

}



static struct configfs_item_operations simple_children_item_ops = {

	.release 	= simple_children_release,

	.show_attribute	= simple_children_attr_show,

};
@@ -345,10 +360,6 @@ static struct configfs_subsystem simple_children_subsys = { 
 * children of its own.

 */



struct simple_children {

	struct config_group group;

};



static struct config_group *group_children_make_group(struct config_group *group, const char *name)

{

	struct simple_children *simple_children;

fs/Kconfig

+11 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ source "fs/xfs/Kconfig" 


config OCFS2_FS

	tristate "OCFS2 file system support (EXPERIMENTAL)"

	depends on NET && EXPERIMENTAL

	depends on NET && SYSFS && EXPERIMENTAL

	select CONFIGFS_FS

	select JBD

	select CRC32
@@ -356,6 +356,16 @@ config OCFS2_FS 
	          - POSIX ACLs

	          - readpages / writepages (not user visible)



config OCFS2_DEBUG_MASKLOG

	bool "OCFS2 logging support"

	depends on OCFS2_FS

	default y

	help

	  The ocfs2 filesystem has an extensive logging system.  The system

	  allows selection of events to log via files in /sys/o2cb/logmask/.

	  This option will enlarge your kernel, but it allows debugging of

	  ocfs2 filesystem issues.



config MINIX_FS

	tristate "Minix fs support"

	help

fs/ocfs2/aops.c

+1 −8
Original line number Diff line number Diff line
@@ -558,16 +558,9 @@ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock, 
	u64 vbo_max; /* file offset, max_blocks from iblock */

	u64 p_blkno;

	int contig_blocks;

	unsigned char blocksize_bits;

	unsigned char blocksize_bits = inode->i_sb->s_blocksize_bits;

	unsigned long max_blocks = bh_result->b_size >> inode->i_blkbits;



	if (!inode || !bh_result) {

		mlog(ML_ERROR, "inode or bh_result is null\n");

		return -EIO;

	}



	blocksize_bits = inode->i_sb->s_blocksize_bits;



	/* This function won't even be called if the request isn't all

	 * nicely aligned and of the right size, so there's no need

	 * for us to check any of that. */

fs/ocfs2/cluster/heartbeat.c

+20 −0
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ static inline void o2hb_prepare_block(struct o2hb_region *reg, 
	hb_block->hb_seq = cpu_to_le64(cputime);

	hb_block->hb_node = node_num;

	hb_block->hb_generation = cpu_to_le64(generation);

	hb_block->hb_dead_ms = cpu_to_le32(o2hb_dead_threshold * O2HB_REGION_TIMEOUT_MS);



	/* This step must always happen last! */

	hb_block->hb_cksum = cpu_to_le32(o2hb_compute_block_crc_le(reg,
@@ -645,6 +646,8 @@ static int o2hb_check_slot(struct o2hb_region *reg, 
	struct o2nm_node *node;

	struct o2hb_disk_heartbeat_block *hb_block = reg->hr_tmp_block;

	u64 cputime;

	unsigned int dead_ms = o2hb_dead_threshold * O2HB_REGION_TIMEOUT_MS;

	unsigned int slot_dead_ms;



	memcpy(hb_block, slot->ds_raw_block, reg->hr_block_bytes);
@@ -733,6 +736,23 @@ fire_callbacks: 
			      &o2hb_live_slots[slot->ds_node_num]);



		slot->ds_equal_samples = 0;



		/* We want to be sure that all nodes agree on the

		 * number of milliseconds before a node will be

		 * considered dead. The self-fencing timeout is

		 * computed from this value, and a discrepancy might

		 * result in heartbeat calling a node dead when it

		 * hasn't self-fenced yet. */

		slot_dead_ms = le32_to_cpu(hb_block->hb_dead_ms);

		if (slot_dead_ms && slot_dead_ms != dead_ms) {

			/* TODO: Perhaps we can fail the region here. */

			mlog(ML_ERROR, "Node %d on device %s has a dead count "

			     "of %u ms, but our count is %u ms.\n"

			     "Please double check your configuration values "

			     "for 'O2CB_HEARTBEAT_THRESHOLD'\n",

			     slot->ds_node_num, reg->hr_dev_name, slot_dead_ms,

			     dead_ms);

		}

		goto out;

	}

fs/ocfs2/cluster/masklog.h

+21 −1
Original line number Diff line number Diff line
@@ -123,6 +123,17 @@ 
#define MLOG_MASK_PREFIX 0

#endif



/*

 * When logging is disabled, force the bit test to 0 for anything other

 * than errors and notices, allowing gcc to remove the code completely.

 * When enabled, allow all masks.

 */

#if defined(CONFIG_OCFS2_DEBUG_MASKLOG)

#define ML_ALLOWED_BITS ~0

#else

#define ML_ALLOWED_BITS (ML_ERROR|ML_NOTICE)

#endif



#define MLOG_MAX_BITS 64



struct mlog_bits {
@@ -187,7 +198,8 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits; 


#define mlog(mask, fmt, args...) do {					\

	u64 __m = MLOG_MASK_PREFIX | (mask);				\

	if (__mlog_test_u64(__m, mlog_and_bits) &&			\

	if ((__m & ML_ALLOWED_BITS) &&					\

	    __mlog_test_u64(__m, mlog_and_bits) &&			\

	    !__mlog_test_u64(__m, mlog_not_bits)) {			\

		if (__m & ML_ERROR)					\

			__mlog_printk(KERN_ERR, "ERROR: "fmt , ##args);	\
@@ -204,6 +216,7 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits; 
		mlog(ML_ERROR, "status = %lld\n", (long long)_st);	\

} while (0)



#if defined(CONFIG_OCFS2_DEBUG_MASKLOG)

#define mlog_entry(fmt, args...) do {					\

	mlog(ML_ENTRY, "ENTRY:" fmt , ##args);				\

} while (0)
@@ -247,6 +260,13 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits; 
#define mlog_exit_void() do {						\

	mlog(ML_EXIT, "EXIT\n");					\

} while (0)

#else

#define mlog_entry(...)  do { } while (0)

#define mlog_entry_void(...)  do { } while (0)

#define mlog_exit(...)  do { } while (0)

#define mlog_exit_ptr(...)  do { } while (0)

#define mlog_exit_void(...)  do { } while (0)

#endif  /* defined(CONFIG_OCFS2_DEBUG_MASKLOG) */



#define mlog_bug_on_msg(cond, fmt, args...) do {			\

	if (cond) {							\

CRA Git | Maintained and supported by SUSTech CRA and CCSE