From: Joel Becker <joel.becker@oracle.com>
Date: Fri, 15 Oct 2010 20:03:09 +0000 (-0700)
Subject: Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fc3718918f13ad72827d62d36ea0f5fb55090644;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window

Conflicts:
	fs/ocfs2/ocfs2.h
---

fc3718918f13ad72827d62d36ea0f5fb55090644
diff --cc fs/ocfs2/ocfs2.h
index 3064feef143,481387b90b2..d8408217e3b
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@@ -263,9 -256,8 +263,10 @@@ enum ocfs2_mount_option
  						   control lists */
  	OCFS2_MOUNT_USRQUOTA = 1 << 10, /* We support user quotas */
  	OCFS2_MOUNT_GRPQUOTA = 1 << 11, /* We support group quotas */
- 
- 	OCFS2_MOUNT_COHERENCY_BUFFERED = 1 << 12 /* Allow concurrent O_DIRECT
- 						    writes */
 -	OCFS2_MOUNT_HB_NONE = 1 << 12, /* No heartbeat */
 -	OCFS2_MOUNT_HB_GLOBAL = 1 << 13, /* Global heartbeat */
++	OCFS2_MOUNT_COHERENCY_BUFFERED = 1 << 12, /* Allow concurrent O_DIRECT
++						     writes */
++	OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
++	OCFS2_MOUNT_HB_GLOBAL = 1 << 14, /* Global heartbeat */
  };
  
  #define OCFS2_OSB_SOFT_RO			0x0001