init-ceph,mkcephfs: default inode64 for mounting xfs

According to hch this is now the default or new kernels.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 7fd433816c1015d0894d704783b43971cc927d45..ae92b39a91a212ea289ff5a0e40d0595741167db 100644 (file)
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -292,8 +292,12 @@ for name in $what; do
                    fi
 
                    if [ -z "$fs_opt" ]; then
-                       #fallback to use at least noatime
-                       fs_opt="rw,noatime"
+                       if [ "$fs_type" = "xfs" ]; then
+                           fs_opt="rw,noatime,inode64"
+                       else
+                           #fallback to use at least noatime
+                           fs_opt="rw,noatime"
+                       fi
                    fi
                fi
 

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index 897a2629930c0e2b6d75832bea1f9c6b0015c88a..446d56872e85f7c5a62c5cc1f7a8c7e1ed93f9ef 100644 (file)
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -340,8 +340,12 @@ if [ -n "$prepareosdfs" ]; then
             get_conf fs_opt "" "btrfs options"
         fi
         if [ -z "$fs_opt" ]; then
-            #fallback to use at least rw,noatime
-            fs_opt="rw,noatime"
+           if [ "$fs_type" = "xfs" ]; then
+               fs_opt="rw,noatime,inode64"
+           else
+                #fallback to use at least rw,noatime
+               fs_opt="rw,noatime"
+           fi
         fi
     fi
     [ -n "$fs_opt" ] && fs_opt="-o $fs_opt"