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

Commit eca281aa 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: (36 commits)
  Ocfs2: Move ocfs2 ioctl definitions from ocfs2_fs.h to newly added ocfs2_ioctl.h
  ocfs2: send SIGXFSZ if new filesize exceeds limit -v2
  ocfs2/userdlm: Add tracing in userdlm
  ocfs2: Use a separate masklog for AST and BASTs
  dlm: allow dlm do recovery during shutdown
  ocfs2: Only bug out in direct io write for reflinked extent.
  ocfs2: fix warning in ocfs2_file_aio_write()
  ocfs2_dlmfs: Enable the use of user cluster stacks.
  ocfs2_dlmfs: Use the stackglue.
  ocfs2_dlmfs: Don't honor truncate.  The size of a dlmfs file is LVB_LEN
  ocfs2: Pass the locking protocol into ocfs2_cluster_connect().
  ocfs2: Remove the ast pointers from ocfs2_stack_plugins
  ocfs2: Hang the locking proto on the cluster conn and use it in asts.
  ocfs2: Attach the connection to the lksb
  ocfs2: Pass lksbs back from stackglue ast/bast functions.
  ocfs2_dlmfs: Move to its own directory
  ocfs2_dlmfs: Use poll() to signify BASTs.
  ocfs2_dlmfs: Add capabilities parameter.
  ocfs2: Handle errors while setting external xattr values.
  ocfs2: Set inline xattr entries with ocfs2_xa_set()
  ...
parents 7f5b09c1 9df5778e

fs/ocfs2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ ocfs2_stackglue-objs := stackglue.o 
ocfs2_stack_o2cb-objs := stack_o2cb.o

ocfs2_stack_user-objs := stack_user.o



obj-$(CONFIG_OCFS2_FS) += dlmfs/

# cluster/ is always needed when OCFS2_FS for masklog support

obj-$(CONFIG_OCFS2_FS) += cluster/

obj-$(CONFIG_OCFS2_FS_O2CB) += dlm/

fs/ocfs2/alloc.c

+3 −2
Original line number Diff line number Diff line
@@ -1050,7 +1050,8 @@ static int ocfs2_create_new_meta_bhs(handle_t *handle, 
			strcpy(eb->h_signature, OCFS2_EXTENT_BLOCK_SIGNATURE);

			eb->h_blkno = cpu_to_le64(first_blkno);

			eb->h_fs_generation = cpu_to_le32(osb->fs_generation);

			eb->h_suballoc_slot = cpu_to_le16(osb->slot_num);

			eb->h_suballoc_slot =

				cpu_to_le16(meta_ac->ac_alloc_slot);

			eb->h_suballoc_bit = cpu_to_le16(suballoc_bit_start);

			eb->h_list.l_count =

				cpu_to_le16(ocfs2_extent_recs_per_eb(osb->sb));
@@ -6037,7 +6038,7 @@ static void ocfs2_truncate_log_worker(struct work_struct *work) 
	if (status < 0)

		mlog_errno(status);

	else

		ocfs2_init_inode_steal_slot(osb);

		ocfs2_init_steal_slots(osb);



	mlog_exit(status);

}

fs/ocfs2/aops.c

+3 −2
Original line number Diff line number Diff line
@@ -577,8 +577,9 @@ 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);

	/* We should already CoW the refcounted extent in case of create. */

	BUG_ON(create && (ext_flags & OCFS2_EXT_REFCOUNTED));



	/*

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

	 * the mapped bit on bh_result().

fs/ocfs2/cluster/masklog.c

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = { 
	define_mask(XATTR),

	define_mask(QUOTA),

	define_mask(REFCOUNT),

	define_mask(BASTS),

	define_mask(ERROR),

	define_mask(NOTICE),

	define_mask(KTHREAD),

fs/ocfs2/cluster/masklog.h

+4 −3
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ 
#define ML_XATTR	0x0000000020000000ULL /* ocfs2 extended attributes */

#define ML_QUOTA	0x0000000040000000ULL /* ocfs2 quota operations */

#define ML_REFCOUNT	0x0000000080000000ULL /* refcount tree operations */

#define ML_BASTS	0x0000001000000000ULL /* dlmglue asts and basts */

/* bits that are infrequently given and frequently matched in the high word */

#define ML_ERROR	0x0000000100000000ULL /* sent to KERN_ERR */

#define ML_NOTICE	0x0000000200000000ULL /* setn to KERN_NOTICE */
@@ -194,9 +195,9 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits; 
 * previous token if args expands to nothing.

 */

#define __mlog_printk(level, fmt, args...)				\

	printk(level "(%u,%lu):%s:%d " fmt, task_pid_nr(current),	\

	       __mlog_cpu_guess, __PRETTY_FUNCTION__, __LINE__ ,	\

	       ##args)

	printk(level "(%s,%u,%lu):%s:%d " fmt, current->comm,		\

	       task_pid_nr(current), __mlog_cpu_guess,			\

	       __PRETTY_FUNCTION__, __LINE__ , ##args)



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

	u64 __m = MLOG_MASK_PREFIX | (mask);				\