cluster: STABLE3 - resource-agents: Add missing btrfs & ext4 support

Lon Hohberger lon at fedoraproject.org
Tue Dec 22 19:22:19 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e58857309b1491f4b780211eea9523589a1cdf66
Commit:        e58857309b1491f4b780211eea9523589a1cdf66
Parent:        83fa41cb23b81108a6ffc6fe79c2656238a0ffb7
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Tue Dec 22 14:20:22 2009 -0500
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Tue Dec 22 14:21:11 2009 -0500

resource-agents: Add missing btrfs & ext4 support

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/resources/fs.sh.in |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/rgmanager/src/resources/fs.sh.in b/rgmanager/src/resources/fs.sh.in
index 51f8f48..65cff9c 100644
--- a/rgmanager/src/resources/fs.sh.in
+++ b/rgmanager/src/resources/fs.sh.in
@@ -364,7 +364,7 @@ verify_fstype()
 	[ -z "$OCF_RESKEY_fstype" ] && return 0
 
 	case $OCF_RESKEY_fstype in
-	ext2|ext3|jfs|xfs|reiserfs|vfat|tmpfs|vxfs)
+	ext2|ext3|ext4|btrfs|jfs|xfs|reiserfs|vfat|tmpfs|vxfs)
 		return 0
 		;;
 	*)
@@ -397,7 +397,7 @@ verify_options()
 		esac
 
 		case $OCF_RESKEY_fstype in
-		ext2|ext3)
+		ext2|ext3|ext4)
 			case $o in
 			bsddf|minixdf|check|check=*|nocheck|debug)
 				continue
@@ -413,7 +413,8 @@ verify_options()
 				;;
 			esac
 
-			if [ "$OCF_RESKEY_fstype" = "ext3" ]; then
+			if [ "$OCF_RESKEY_fstype" = "ext3" ] ||
+			   [ "$OCF_RESKEY_fstype" = "ext4" ]; then
 				case $0 in
 				noload|data=*)
 					continue
@@ -485,6 +486,10 @@ verify_options()
 				;;
 			esac
 			;;
+		btrfs)
+			# tbd
+			continue
+			;;
 		esac
 
 		echo Option $o not supported for $OCF_RESKEY_fstype
@@ -1008,6 +1013,8 @@ Cannot mount $dev on $mp, the device or mount point is already in use!"
         case "$fstype" in
         reiserfs) typeset fsck_needed="" ;;
         ext3)     typeset fsck_needed="" ;;
+        ext4)     typeset fsck_needed="" ;;
+        btrfs)    typeset fsck_needed="" ;;
         jfs)      typeset fsck_needed="" ;;
         xfs)      typeset fsck_needed="" ;;
 	vxfs)	  typeset fsck_needed="" ;;


More information about the cluster-commits mailing list