diff --git a/doc/source/deployment_guide.rst b/doc/source/deployment_guide.rst
index 0c149fca36..6c132dd1e0 100644
--- a/doc/source/deployment_guide.rst
+++ b/doc/source/deployment_guide.rst
@@ -2336,7 +2336,7 @@ headroom.
 
 The following example mount options are recommended when using XFS::
 
-    mount -t xfs -o noatime,nodiratime,nobarrier,logbufs=8 -L D1 /srv/node/d1
+    mount -t xfs -o noatime,nodiratime,logbufs=8 -L D1 /srv/node/d1
 
 We do not recommend running Swift on RAID, but if you are using
 RAID it is also important to make sure that the proper sunit and swidth
diff --git a/doc/source/development_saio.rst b/doc/source/development_saio.rst
index 3a1e505d93..427a7fe4a2 100644
--- a/doc/source/development_saio.rst
+++ b/doc/source/development_saio.rst
@@ -98,7 +98,7 @@ another device when creating the VM, and follow these instructions:
 
 #. Edit ``/etc/fstab`` and add::
 
-      /dev/sdb1 /mnt/sdb1 xfs noatime,nodiratime,nobarrier,logbufs=8 0 0
+      /dev/sdb1 /mnt/sdb1 xfs noatime,nodiratime,logbufs=8 0 0
 
 #. Create the mount point and the individualized links::
 
@@ -158,7 +158,7 @@ these instructions:
 
 #. Edit `/etc/fstab` and add::
 
-      /srv/swift-disk /mnt/sdb1 xfs loop,noatime,nodiratime,nobarrier,logbufs=8 0 0
+      /srv/swift-disk /mnt/sdb1 xfs loop,noatime,nodiratime,logbufs=8 0 0
 
 #. Create the mount point and the individualized links::
 
diff --git a/doc/source/install/storage-install-obs.rst b/doc/source/install/storage-install-obs.rst
index 3199843132..3de391ef74 100644
--- a/doc/source/install/storage-install-obs.rst
+++ b/doc/source/install/storage-install-obs.rst
@@ -53,8 +53,8 @@ storage nodes, you must prepare the storage devices.
 
    .. code-block:: none
 
-        /dev/sdb /srv/node/sdb xfs noatime,nodiratime,nobarrier,logbufs=8 0 2
-        /dev/sdc /srv/node/sdc xfs noatime,nodiratime,nobarrier,logbufs=8 0 2
+        /dev/sdb /srv/node/sdb xfs noatime,nodiratime,logbufs=8 0 2
+        /dev/sdc /srv/node/sdc xfs noatime,nodiratime,logbufs=8 0 2
 
 #. Mount the devices:
 
diff --git a/doc/source/install/storage-install-rdo.rst b/doc/source/install/storage-install-rdo.rst
index 621a17cfaa..403b7d01ea 100644
--- a/doc/source/install/storage-install-rdo.rst
+++ b/doc/source/install/storage-install-rdo.rst
@@ -52,8 +52,8 @@ storage nodes, you must prepare the storage devices.
 
    .. code-block:: none
 
-        /dev/sdb /srv/node/sdb xfs noatime,nodiratime,nobarrier,logbufs=8 0 2
-        /dev/sdc /srv/node/sdc xfs noatime,nodiratime,nobarrier,logbufs=8 0 2
+        /dev/sdb /srv/node/sdb xfs noatime,nodiratime,logbufs=8 0 2
+        /dev/sdc /srv/node/sdc xfs noatime,nodiratime,logbufs=8 0 2
 
 #. Mount the devices:
 
diff --git a/doc/source/install/storage-install-ubuntu-debian.rst b/doc/source/install/storage-install-ubuntu-debian.rst
index 3c0fd8e349..81af9ac00e 100644
--- a/doc/source/install/storage-install-ubuntu-debian.rst
+++ b/doc/source/install/storage-install-ubuntu-debian.rst
@@ -52,8 +52,8 @@ storage nodes, you must prepare the storage devices.
 
    .. code-block:: none
 
-        /dev/sdb /srv/node/sdb xfs noatime,nodiratime,nobarrier,logbufs=8 0 2
-        /dev/sdc /srv/node/sdc xfs noatime,nodiratime,nobarrier,logbufs=8 0 2
+        /dev/sdb /srv/node/sdb xfs noatime,nodiratime,logbufs=8 0 2
+        /dev/sdc /srv/node/sdc xfs noatime,nodiratime,logbufs=8 0 2
 
 #. Mount the devices:
 
diff --git a/test/unit/common/middleware/test_recon.py b/test/unit/common/middleware/test_recon.py
index 708ecf5208..f36cc5a1cc 100644
--- a/test/unit/common/middleware/test_recon.py
+++ b/test/unit/common/middleware/test_recon.py
@@ -514,7 +514,7 @@ class TestReconSuccess(TestCase):
             'none /var/run tmpfs rw,nosuid,relatime,mode=755 0 0',
             'none /var/lock tmpfs rw,nosuid,nodev,noexec,relatime 0 0',
             'none /lib/init/rw tmpfs rw,nosuid,relatime,mode=755 0 0',
-            '/dev/loop0 /mnt/sdb1 xfs rw,noatime,nodiratime,attr2,nobarrier,'
+            '/dev/loop0 /mnt/sdb1 xfs rw,noatime,nodiratime,attr2,'
             'logbufs=8,noquota 0 0',
             'rpc_pipefs /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0',
             'nfsd /proc/fs/nfsd nfsd rw,relatime 0 0',
diff --git a/tools/playbooks/multinode_setup/configure_loopback.yaml b/tools/playbooks/multinode_setup/configure_loopback.yaml
index 7a82e132aa..5234393e93 100644
--- a/tools/playbooks/multinode_setup/configure_loopback.yaml
+++ b/tools/playbooks/multinode_setup/configure_loopback.yaml
@@ -31,7 +31,7 @@
         state: directory
 
     - name: mount /mnt/sdb1
-      mount: name=/mnt/sdb1 src=/srv/swift-disk fstype=xfs opts="loop,noatime,nodiratime,nobarrier,logbufs=8" dump=0 passno=0 state=mounted
+      mount: name=/mnt/sdb1 src=/srv/swift-disk fstype=xfs opts="loop,noatime,nodiratime,logbufs=8" dump=0 passno=0 state=mounted
 
     - name: create sub-partitions
       file:
diff --git a/tools/playbooks/saio_single_node_setup/setup_saio.yaml b/tools/playbooks/saio_single_node_setup/setup_saio.yaml
index 070cdde266..539b89e24e 100644
--- a/tools/playbooks/saio_single_node_setup/setup_saio.yaml
+++ b/tools/playbooks/saio_single_node_setup/setup_saio.yaml
@@ -29,7 +29,7 @@
       file: path=/mnt/sdb1 state=directory
 
     - name: mount /mnt/sdb1
-      mount: name=/mnt/sdb1 src=/srv/swift-disk fstype=xfs opts="loop,noatime,nodiratime,nobarrier,logbufs=8" dump=0 passno=0 state=mounted
+      mount: name=/mnt/sdb1 src=/srv/swift-disk fstype=xfs opts="loop,noatime,nodiratime,logbufs=8" dump=0 passno=0 state=mounted
 
     - name: create sub-partitions
       file: >