From 5d7d891380f569deaf403aae46a9354eb0243999 Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Mon, 3 Dec 2018 14:21:06 +0000 Subject: [PATCH] Drop the deprecated and now removed barrier XFS mount options Both barrier and nobarrier were deprecated with the 4.10 kernel [1] and then removed [2] with the 4.19 kernel as now used by Fedora >= 28. Both should be safe to drop at this point. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4cf4573 [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1c02d50 Change-Id: I6871a7765e3e04122d8d546f43d36bb8415383fc --- functions | 2 +- lib/swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/functions b/functions index 051c8160f7..187ad2311d 100644 --- a/functions +++ b/functions @@ -739,7 +739,7 @@ function create_disk { # Mount the disk with mount options to make it as efficient as possible if ! egrep -q ${storage_data_dir} /proc/mounts; then - sudo mount -t xfs -o loop,noatime,nodiratime,nobarrier,logbufs=8 \ + sudo mount -t xfs -o loop,noatime,nodiratime,logbufs=8 \ ${disk_image} ${storage_data_dir} fi } diff --git a/lib/swift b/lib/swift index 3b3e608e80..e2ee0cb470 100644 --- a/lib/swift +++ b/lib/swift @@ -607,7 +607,7 @@ function create_swift_disk { # Mount the disk with mount options to make it as efficient as possible mkdir -p ${SWIFT_DATA_DIR}/drives/sdb1 if ! egrep -q ${SWIFT_DATA_DIR}/drives/sdb1 /proc/mounts; then - sudo mount -t xfs -o loop,noatime,nodiratime,nobarrier,logbufs=8 \ + sudo mount -t xfs -o loop,noatime,nodiratime,logbufs=8 \ ${SWIFT_DISK_IMAGE} ${SWIFT_DATA_DIR}/drives/sdb1 fi