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

Commit abc7968b authored by Guozhonghua's avatar Guozhonghua Committed by Greg Kroah-Hartman
Browse files

ocfs2: without quota support, avoid calling quota recovery 

[ Upstream commit 21158ca85b73ddd0088076a5209cfd040513a8b5 ]

During one dead node's recovery by other node, quota recovery work will
be queued.  We should avoid calling quota when it is not supported, so
check the quota flags.

Link: http://lkml.kernel.org/r/71604351584F6A4EBAE558C676F37CA401071AC9FB@H3CMLB12-EX.srv.huawei-3com.com


Signed-off-by: default avatarguozhonghua <guozhonghua@h3c.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Joseph Qi <jiangqi903@gmail.com>
Cc: Changwei Ge <ge.changwei@h3c.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6a2245d8

fs/ocfs2/journal.c

+34 −17
Original line number Diff line number Diff line
@@ -1379,16 +1379,24 @@ static int __ocfs2_recovery_thread(void *arg) 
	int rm_quota_used = 0, i;

	struct ocfs2_quota_recovery *qrec;



	/* Whether the quota supported. */

	int quota_enabled = OCFS2_HAS_RO_COMPAT_FEATURE(osb->sb,

			OCFS2_FEATURE_RO_COMPAT_USRQUOTA)

		|| OCFS2_HAS_RO_COMPAT_FEATURE(osb->sb,

			OCFS2_FEATURE_RO_COMPAT_GRPQUOTA);



	status = ocfs2_wait_on_mount(osb);

	if (status < 0) {

		goto bail;

	}



	if (quota_enabled) {

		rm_quota = kcalloc(osb->max_slots, sizeof(int), GFP_NOFS);

		if (!rm_quota) {

			status = -ENOMEM;

			goto bail;

		}

	}

restart:

	status = ocfs2_super_lock(osb, 1);

	if (status < 0) {
@@ -1423,9 +1431,14 @@ static int __ocfs2_recovery_thread(void *arg) 
		 * then quota usage would be out of sync until some node takes

		 * the slot. So we remember which nodes need quota recovery

		 * and when everything else is done, we recover quotas. */

		for (i = 0; i < rm_quota_used && rm_quota[i] != slot_num; i++);

		if (quota_enabled) {

			for (i = 0; i < rm_quota_used

					&& rm_quota[i] != slot_num; i++)

				;



			if (i == rm_quota_used)

				rm_quota[rm_quota_used++] = slot_num;

		}



		status = ocfs2_recover_node(osb, node_num, slot_num);

skip_recovery:
@@ -1453,6 +1466,7 @@ static int __ocfs2_recovery_thread(void *arg) 
	/* Now it is right time to recover quotas... We have to do this under

	 * superblock lock so that no one can start using the slot (and crash)

	 * before we recover it */

	if (quota_enabled) {

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

			qrec = ocfs2_begin_quota_recovery(osb, rm_quota[i]);

			if (IS_ERR(qrec)) {
@@ -1460,10 +1474,12 @@ static int __ocfs2_recovery_thread(void *arg) 
				mlog_errno(status);

				continue;

			}

		ocfs2_queue_recovery_completion(osb->journal, rm_quota[i],

			ocfs2_queue_recovery_completion(osb->journal,

					rm_quota[i],

					NULL, NULL, qrec,

					ORPHAN_NEED_TRUNCATE);

		}

	}



	ocfs2_super_unlock(osb, 1);
@@ -1484,6 +1500,7 @@ static int __ocfs2_recovery_thread(void *arg) 


	mutex_unlock(&osb->recovery_lock);



	if (quota_enabled)

		kfree(rm_quota);



	/* no one is callint kthread_stop() for us so the kthread() api