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

Commit d1f3e68e 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:
  o2dlm: force free mles during dlm exit
  ocfs2: Sync inode flags with ext2.
  ocfs2: Move 'wanted' into parens of ocfs2_resmap_resv_bits.
  ocfs2: Use cpu_to_le16 for e_leaf_clusters in ocfs2_bg_discontig_add_extent.
  ocfs2: update ctime when changing the file's permission by setfacl
  ocfs2/net: fix uninitialized ret in o2net_send_message_vec()
  Ocfs2: Handle empty list in lockres_seq_start() for dlmdebug.c
  Ocfs2: Re-access the journal after ocfs2_insert_extent() in dxdir codes.
  ocfs2: Fix lockdep warning in reflink.
  ocfs2/lockdep: Move ip_xattr_sem out of ocfs2_xattr_get_nolock.
parents cb9cae03 5dad6c39

fs/ocfs2/acl.c

+3 −0
Original line number Diff line number Diff line
@@ -209,7 +209,10 @@ static int ocfs2_acl_set_mode(struct inode *inode, struct buffer_head *di_bh, 
	}



	inode->i_mode = new_mode;

	inode->i_ctime = CURRENT_TIME;

	di->i_mode = cpu_to_le16(inode->i_mode);

	di->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec);

	di->i_ctime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);



	ocfs2_journal_dirty(handle, di_bh);

fs/ocfs2/cluster/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -977,7 +977,7 @@ static int o2net_tx_can_proceed(struct o2net_node *nn, 
int o2net_send_message_vec(u32 msg_type, u32 key, struct kvec *caller_vec,

			   size_t caller_veclen, u8 target_node, int *status)

{

	int ret;

	int ret = 0;

	struct o2net_msg *msg = NULL;

	size_t veclen, caller_bytes = 0;

	struct kvec *vec = NULL;

fs/ocfs2/dir.c

+16 −8
Original line number Diff line number Diff line
@@ -3931,6 +3931,15 @@ static int ocfs2_dx_dir_rebalance(struct ocfs2_super *osb, struct inode *dir, 
		goto out_commit;

	}



	cpos = split_hash;

	ret = ocfs2_dx_dir_new_cluster(dir, &et, cpos, handle,

				       data_ac, meta_ac, new_dx_leaves,

				       num_dx_leaves);

	if (ret) {

		mlog_errno(ret);

		goto out_commit;

	}



	for (i = 0; i < num_dx_leaves; i++) {

		ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir),

					      orig_dx_leaves[i],
@@ -3939,16 +3948,15 @@ static int ocfs2_dx_dir_rebalance(struct ocfs2_super *osb, struct inode *dir, 
			mlog_errno(ret);

			goto out_commit;

		}

	}



	cpos = split_hash;

	ret = ocfs2_dx_dir_new_cluster(dir, &et, cpos, handle,

				       data_ac, meta_ac, new_dx_leaves,

				       num_dx_leaves);

		ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir),

					      new_dx_leaves[i],

					      OCFS2_JOURNAL_ACCESS_WRITE);

		if (ret) {

			mlog_errno(ret);

			goto out_commit;

		}

	}



	ocfs2_dx_dir_transfer_leaf(dir, split_hash, handle, tmp_dx_leaf,

				   orig_dx_leaves, new_dx_leaves, num_dx_leaves);

fs/ocfs2/dlm/dlmcommon.h

+1 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,7 @@ int dlm_drop_lockres_ref(struct dlm_ctxt *dlm, 
			 struct dlm_lock_resource *res);

void dlm_clean_master_list(struct dlm_ctxt *dlm,

			   u8 dead_node);

void dlm_force_free_mles(struct dlm_ctxt *dlm);

int dlm_lock_basts_flushed(struct dlm_ctxt *dlm, struct dlm_lock *lock);

int __dlm_lockres_has_locks(struct dlm_lock_resource *res);

int __dlm_lockres_unused(struct dlm_lock_resource *res);

fs/ocfs2/dlm/dlmdebug.c

+8 −1
Original line number Diff line number Diff line
@@ -636,8 +636,14 @@ static void *lockres_seq_start(struct seq_file *m, loff_t *pos) 
	spin_lock(&dlm->track_lock);

	if (oldres)

		track_list = &oldres->tracking;

	else

	else {

		track_list = &dlm->tracking_list;

		if (list_empty(track_list)) {

			dl = NULL;

			spin_unlock(&dlm->track_lock);

			goto bail;

		}

	}



	list_for_each_entry(res, track_list, tracking) {

		if (&res->tracking == &dlm->tracking_list)
@@ -660,6 +666,7 @@ static void *lockres_seq_start(struct seq_file *m, loff_t *pos) 
	} else

		dl = NULL;



bail:

	/* passed to seq_show */

	return dl;

}