Update indent settings remainder

Fixes: https://tracker.ceph.com/issues/72587
Signed-off-by: Edwin Rodriguez <edwin.rodriguez1@ibm.com>

diff --git a/examples/librados/hello_world_c.c b/examples/librados/hello_world_c.c
index 2f91828dee889d270c052be584226ef37d6505a8..d6f33bca53f91f36e373e90ddcd382266b289ad5 100644 (file)
--- a/examples/librados/hello_world_c.c
+++ b/examples/librados/hello_world_c.c
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/qa/standalone/scrub/osd-mapper.sh b/qa/standalone/scrub/osd-mapper.sh
index bfe57eac03e9bdb473cfdb620d068cc6e0b2ccbd..4bf3a5a62a65f3d904899342e5af1274dab62912 100755 (executable)
--- a/qa/standalone/scrub/osd-mapper.sh
+++ b/qa/standalone/scrub/osd-mapper.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-# -*- mode:text; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-# vim: ts=8 sw=2 smarttab
+# -*- mode:text; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+# vim: ts=8 sw=2 sts=2 expandtab
 #
 # test the handling of a corrupted SnapMapper DB by Scrub
 

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 2834cb666fe5ee35a581633a888ecd738f490d79..1b5fa66aaadeb3864e31fab139a43eba281335b7 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-# -*- mode:shell-script; tab-width:8; sh-basic-offset:2; indent-tabs-mode:t -*-
-# vim: ts=8 sw=8 ft=bash smarttab
+# -*- mode:shell-script; tab-width:8; sh-basic-offset:2; indent-tabs-mode:nil -*-
+# vim: ts=8 sw=8 ft=bash expandtab
 set -x
 
 source $(dirname $0)/../../standalone/ceph-helpers.sh

diff --git a/qa/workunits/rados/ec-esb-fio.sh b/qa/workunits/rados/ec-esb-fio.sh
index 32866f73166af9399ab822bae01cfe25f6ed4545..6fb65dcf8cb596f154fe76d9e6f60c175b009a79 100755 (executable)
--- a/qa/workunits/rados/ec-esb-fio.sh
+++ b/qa/workunits/rados/ec-esb-fio.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# vim: ts=8 sw=2 smarttab
+# vim: ts=8 sw=2 sts=2 expandtab
 set -ex
 
 # Install FIO

diff --git a/qa/workunits/rados/test_large_omap_detection.py b/qa/workunits/rados/test_large_omap_detection.py
index b5c81a8d86b9bbd7903f55ef1d58a3853a73b1c8..8b93f666ca18993f8cfccca3821d6ef889d1bf6e 100755 (executable)
--- a/qa/workunits/rados/test_large_omap_detection.py
+++ b/qa/workunits/rados/test_large_omap_detection.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- mode:python -*-
-# vim: ts=4 sw=4 smarttab expandtab
+# vim: ts=4 sw=4 expandtab
 #
 # Copyright (C) 2017 Red Hat <contact@redhat.com>
 #

diff --git a/src/arch/s390x.c b/src/arch/s390x.c
index dec654ef7d96e5b89dd815cf4d7c8297e346cc8a..f392a18c4fef37c8c818ba755938a7fd03a6169f 100644 (file)
--- a/src/arch/s390x.c
+++ b/src/arch/s390x.c
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/auth/krb/KrbAuthorizeHandler.cpp b/src/auth/krb/KrbAuthorizeHandler.cpp
index 8c7523e607aed6e0e5342a1ec41533d3d5567dc7..f8bbbf73f2250dd23c1e4dd61eb79349e3a72511 100644 (file)
--- a/src/auth/krb/KrbAuthorizeHandler.cpp
+++ b/src/auth/krb/KrbAuthorizeHandler.cpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/auth/krb/KrbAuthorizeHandler.hpp b/src/auth/krb/KrbAuthorizeHandler.hpp
index 448b682e68d2425e8ab9730f3c3f1419364e45a1..7752a0be4703ab9051e8150725ce82de6c909b97 100644 (file)
--- a/src/auth/krb/KrbAuthorizeHandler.hpp
+++ b/src/auth/krb/KrbAuthorizeHandler.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/auth/krb/KrbClientHandler.cpp b/src/auth/krb/KrbClientHandler.cpp
index 1f728b4dd6e0040470a5a3445bcbc4c3fd2f22a3..f19e9fc3f8305e224f7d6f8c8533e2b1549cf36d 100644 (file)
--- a/src/auth/krb/KrbClientHandler.cpp
+++ b/src/auth/krb/KrbClientHandler.cpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/auth/krb/KrbClientHandler.hpp b/src/auth/krb/KrbClientHandler.hpp
index 58e5311167a48511356c665d19f573147d9e5ac4..c36591bcb41ca31d44d7c25b02966f7ceba68d4a 100644 (file)
--- a/src/auth/krb/KrbClientHandler.hpp
+++ b/src/auth/krb/KrbClientHandler.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/auth/krb/KrbProtocol.cpp b/src/auth/krb/KrbProtocol.cpp
index 6988d35566dec9b8da0a2df52fbc5b2d60422102..9777f579e9c63d315ca0ddebb53178abe8130699 100644 (file)
--- a/src/auth/krb/KrbProtocol.cpp
+++ b/src/auth/krb/KrbProtocol.cpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/auth/krb/KrbProtocol.hpp b/src/auth/krb/KrbProtocol.hpp
index abddb584878b91dde10901a587da53969d2f0f35..a1f55bd1a1e1d6af64cf28add8b278eb7131974e 100644 (file)
--- a/src/auth/krb/KrbProtocol.hpp
+++ b/src/auth/krb/KrbProtocol.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/auth/krb/KrbServiceHandler.cpp b/src/auth/krb/KrbServiceHandler.cpp
index c2ca3bbf28ccd04daebc4348fc00d5164c25a43f..3fdd23f44cfd5fd42ae209fe6270d099e95864d1 100644 (file)
--- a/src/auth/krb/KrbServiceHandler.cpp
+++ b/src/auth/krb/KrbServiceHandler.cpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/auth/krb/KrbServiceHandler.hpp b/src/auth/krb/KrbServiceHandler.hpp
index 85cf5a1a6e6ac38069626284a977258254acf6ec..fbd96b49e1683bb3b460f16e00a1fa210ffb3eb4 100644 (file)
--- a/src/auth/krb/KrbServiceHandler.hpp
+++ b/src/auth/krb/KrbServiceHandler.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/auth/krb/KrbSessionHandler.hpp b/src/auth/krb/KrbSessionHandler.hpp
index ee80d7909333a0fc62176862f1f196c1d5bed36d..4c853dba601ad3b1fd1f5dbd4e1bccebd2aad0f9 100644 (file)
--- a/src/auth/krb/KrbSessionHandler.hpp
+++ b/src/auth/krb/KrbSessionHandler.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/ceph-crash.in b/src/ceph-crash.in
index 0e02837fadd4dde8abd66985b485836402e10a37..52303c3e8a5ff7e21c9c311f8a83fe1ae3ebeb0d 100755 (executable)
--- a/src/ceph-crash.in
+++ b/src/ceph-crash.in
@@ -1,6 +1,6 @@
 #!@Python3_EXECUTABLE@
 # -*- mode:python -*-
-# vim: ts=4 sw=4 smarttab expandtab
+# vim: ts=4 sw=4 expandtab
 
 import argparse
 import grp

diff --git a/src/ceph-volume/plugin/zfs/ceph_volume_zfs/devices/zfs/main.py b/src/ceph-volume/plugin/zfs/ceph_volume_zfs/devices/zfs/main.py
index 073be6467dc3bec6bca3d488fd80d8c8e956ac7d..4cd9b7e21ab5133e0bb8e39526cb474286e75155 100644 (file)
--- a/src/ceph-volume/plugin/zfs/ceph_volume_zfs/devices/zfs/main.py
+++ b/src/ceph-volume/plugin/zfs/ceph_volume_zfs/devices/zfs/main.py
@@ -1,4 +1,4 @@
-# vim: expandtab smarttab shiftwidth=4 softtabstop=4
+# vim: expandtab shiftwidth=4 softtabstop=4
 
 import argparse
 from textwrap import dedent

diff --git a/src/ceph.in b/src/ceph.in
index 51743dd9ae8c928cf36f9589c52e3428624d99dd..6c8a1e944ca1a4a9ea173fb7a9f6b9b2d96d6e7c 100755 (executable)
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -1,6 +1,6 @@
 #!@Python3_EXECUTABLE@
 # -*- mode:python -*-
-# vim: ts=4 sw=4 smarttab expandtab
+# vim: ts=4 sw=4 expandtab
 #
 # Processed in Makefile to add python #! line and version variable
 #

diff --git a/src/common/addr_parsing.c b/src/common/addr_parsing.c
index 0e183c667c2cdd09e150306a1718ed71fe9a7743..3dd29b144b4f6abb2611681884e979ef209ce745 100644 (file)
--- a/src/common/addr_parsing.c
+++ b/src/common/addr_parsing.c
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*- 
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/common/bit_vector.hpp b/src/common/bit_vector.hpp
index e6df71c86f44bb3b4977b8d54aa0b526a126df84..a4b8ae9ee7b0e8f5b9a5118e46d03a9af92b77bc 100644 (file)
--- a/src/common/bit_vector.hpp
+++ b/src/common/bit_vector.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/common/bloom_filter.hpp b/src/common/bloom_filter.hpp
index 8fe1e4ee5e93c7d2287875337115b387621afc65..6fed500907355d31fd9b3c0acc2d65780e8ca8c0 100644 (file)
--- a/src/common/bloom_filter.hpp
+++ b/src/common/bloom_filter.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 
 /*
  *******************************************************************

diff --git a/src/common/map_cacher.hpp b/src/common/map_cacher.hpp
index 93bda03a252185fd4d6f86331ee2bc49e461e112..462ca2da4055ee10ecbf22ca36ac235547996c75 100644 (file)
--- a/src/common/map_cacher.hpp
+++ b/src/common/map_cacher.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/common/mime.c b/src/common/mime.c
index fe45123ccc94c0f3f8e030a2d127d3662fedf1ca..843d9e5ce5e66557095899d2c68040d1a67d4e73 100644 (file)
--- a/src/common/mime.c
+++ b/src/common/mime.c
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/common/reverse.c b/src/common/reverse.c
index f65540d54facea87156657117939630311fd8c3d..1a2370e9dba6301129140c34fa11f6bef13410b9 100644 (file)
--- a/src/common/reverse.c
+++ b/src/common/reverse.c
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/common/safe_io.c b/src/common/safe_io.c
index 80921d0f2e43a4a5298d1a7af2758c263597578e..b8326d481b7991ba2361b0d90974d8550fb04aba 100644 (file)
--- a/src/common/safe_io.c
+++ b/src/common/safe_io.c
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/common/secret.c b/src/common/secret.c
index fe34efdff83b25b6fcfe38231a9663529b3a2514..5ea5f1d40de939af03bb1bf3bd52d74d6d3ce103 100644 (file)
--- a/src/common/secret.c
+++ b/src/common/secret.c
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/common/shared_cache.hpp b/src/common/shared_cache.hpp
index d285e370ba5803e17c009f2c1d3012ce23bfe446..f84f2ee3a672baa60a45436acf13f97461976241 100644 (file)
--- a/src/common/shared_cache.hpp
+++ b/src/common/shared_cache.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*- 
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/common/sharedptr_registry.hpp b/src/common/sharedptr_registry.hpp
index 8c0db6c24a7025247596c7517fd80e156b3c3c18..bca8648230881d609b859fa3c77f9c9af19dbc45 100644 (file)
--- a/src/common/sharedptr_registry.hpp
+++ b/src/common/sharedptr_registry.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/common/simple_cache.hpp b/src/common/simple_cache.hpp
index 07d19a731b1fc1ea5c8a73a34819ee188821582d..68905c75b2a3ccf3e4131765d9f1167cb695db5e 100644 (file)
--- a/src/common/simple_cache.hpp
+++ b/src/common/simple_cache.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*- 
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/common/tracked_int_ptr.hpp b/src/common/tracked_int_ptr.hpp
index fc54c4cb9d6717ff9f4f10863f5d8a7879b41ec6..67f3b014086f0cf0df24cddd1dda067b639c4273 100644 (file)
--- a/src/common/tracked_int_ptr.hpp
+++ b/src/common/tracked_int_ptr.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/common/utf8.c b/src/common/utf8.c
index 3a05789f603888fe6cbf0db62c7567c379da00a6..4e3240267a16eb1568d7a3e2053ea5bed0abb7fa 100644 (file)
--- a/src/common/utf8.c
+++ b/src/common/utf8.c
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/doc/header.txt b/src/doc/header.txt
index bccdb81533b6fe4a8509b4299248e767844fb87f..cbe26cf04f31a837e5f91f15436cde431b84eb46 100644 (file)
--- a/src/doc/header.txt
+++ b/src/doc/header.txt
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*- 
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/doc/modeline.txt b/src/doc/modeline.txt
index 1b3956f4d486bbc0eadefd64c8208ea1589284f7..ddacfb79a6b6c272909f6abdcc9ef8e98c555937 100644 (file)
--- a/src/doc/modeline.txt
+++ b/src/doc/modeline.txt
@@ -1,2 +1,2 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*- 
+// vim: ts=8 sw=2 sts=2 expandtab

diff --git a/src/erasure-code/shec/determinant.c b/src/erasure-code/shec/determinant.c
index 15b62c9efcfcae15f4587fd90d2c2ba11cf00ec0..4a67ac5871e1a3eae430724f443aa797d1de0d06 100644 (file)
--- a/src/erasure-code/shec/determinant.c
+++ b/src/erasure-code/shec/determinant.c
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/include/neorados/RADOS.hpp b/src/include/neorados/RADOS.hpp
index 4b595258ca80fa859a15c2b9c4b32301e27af2a4..f0f734cc3abc8944797965d9c6670b6c76f045a5 100644 (file)
--- a/src/include/neorados/RADOS.hpp
+++ b/src/include/neorados/RADOS.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/include/neorados/RADOS_Decodable.hpp b/src/include/neorados/RADOS_Decodable.hpp
index 777a2525c8e04b25d51a12d43356afe4d740d41c..c5b5c7f4c6841a5dc5021f03dc5d63c793d6b6e6 100644 (file)
--- a/src/include/neorados/RADOS_Decodable.hpp
+++ b/src/include/neorados/RADOS_Decodable.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/include/rbd/librbd.hpp b/src/include/rbd/librbd.hpp
index 0ac315a76f4881a7aafe07ff61e42c034f1ef1ee..d86f4b17baeb4ef31f5d046d734fcb5302383d73 100644 (file)
--- a/src/include/rbd/librbd.hpp
+++ b/src/include/rbd/librbd.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/pybind/ceph_daemon.py b/src/pybind/ceph_daemon.py
index 0a70e92bc93a29e4d4c9d1079a72715cf94ed8e3..b470eb1fdfac07da79a7af293482caa512e2477b 100644 (file)
--- a/src/pybind/ceph_daemon.py
+++ b/src/pybind/ceph_daemon.py
@@ -1,5 +1,5 @@
 # -*- mode:python -*-
-# vim: ts=4 sw=4 smarttab expandtab
+# vim: ts=4 sw=4 expandtab
 
 """
 Copyright (C) 2015 Red Hat

diff --git a/src/pybind/ceph_mgr_repl.py b/src/pybind/ceph_mgr_repl.py
index 159abdc99a5e4409b316fcd013f88201fa05a466..68613b389ed3c8e7ac2f60e061fb7a206130a41e 100755 (executable)
--- a/src/pybind/ceph_mgr_repl.py
+++ b/src/pybind/ceph_mgr_repl.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # -*- mode:python -*-
-# vim: ts=4 sw=4 smarttab expandtab
+# vim: ts=4 sw=4 expandtab
 
 __all__ = ['ConsoleOptions', 'MgrModuleInterpreter']
 

diff --git a/src/python-common/ceph/rgw/rgwam_core.py b/src/python-common/ceph/rgw/rgwam_core.py
index 9b19865bfc5012aff74b59605be5641df1bc9373..e11eb8e528a6ed236a407d4f7d30c87e030718a1 100644 (file)
--- a/src/python-common/ceph/rgw/rgwam_core.py
+++ b/src/python-common/ceph/rgw/rgwam_core.py
@@ -1,5 +1,5 @@
 # -*- mode:python -*-
-# vim: ts=4 sw=4 smarttab expandtab
+# vim: ts=4 sw=4 expandtab
 #
 # Processed in Makefile to add python #! line and version variable
 #

diff --git a/src/rbd_replay/BoundedBuffer.hpp b/src/rbd_replay/BoundedBuffer.hpp
index 6185d26663e17b88d3cf3ee24272b63b21be2107..d0b6f8f1308344b304da76a39a3a7ef3a61bba87 100644 (file)
--- a/src/rbd_replay/BoundedBuffer.hpp
+++ b/src/rbd_replay/BoundedBuffer.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 
 #ifndef _INCLUDED_BOUNDED_BUFFER_HPP
 #define _INCLUDED_BOUNDED_BUFFER_HPP

diff --git a/src/rbd_replay/ImageNameMap.hpp b/src/rbd_replay/ImageNameMap.hpp
index 45cdaf68694786ff2f9cd15ce5556cbdd7ada4b1..0b31954bbe10db66ccfdbef9b02c688911b99b95 100644 (file)
--- a/src/rbd_replay/ImageNameMap.hpp
+++ b/src/rbd_replay/ImageNameMap.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/rbd_replay/PendingIO.hpp b/src/rbd_replay/PendingIO.hpp
index 3942d5f6fd9d9f2ebccf694a5d37d98aa546001e..a5d41d73593b1df1e3be42808b1be28b99e14223 100644 (file)
--- a/src/rbd_replay/PendingIO.hpp
+++ b/src/rbd_replay/PendingIO.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/rbd_replay/Replayer.hpp b/src/rbd_replay/Replayer.hpp
index 02bca019c71022a195bcddf3fe0db4b3f9f7b546..d42a7d0bbd9ef7b27fc7a290b738a672dd32e18b 100644 (file)
--- a/src/rbd_replay/Replayer.hpp
+++ b/src/rbd_replay/Replayer.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/rbd_replay/actions.hpp b/src/rbd_replay/actions.hpp
index 3b5dd8bd789056f180e55710445a04254352f6ad..e95009b7dbd762e6039ab31b66fa917314da3bb1 100644 (file)
--- a/src/rbd_replay/actions.hpp
+++ b/src/rbd_replay/actions.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/rbd_replay/ios.hpp b/src/rbd_replay/ios.hpp
index 8a105afd2d7e48191eac04cce9e479833f15b34f..b824461b98160af4d97fc527574cd1750920021d 100644 (file)
--- a/src/rbd_replay/ios.hpp
+++ b/src/rbd_replay/ios.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/rbd_replay/rbd_loc.hpp b/src/rbd_replay/rbd_loc.hpp
index 8b7bfac1f2b6f5e6fe713b57066396beb1240b87..9cf1d0b43aa317a1d7dc7aeea613432ce0762caa 100644 (file)
--- a/src/rbd_replay/rbd_loc.hpp
+++ b/src/rbd_replay/rbd_loc.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/rbd_replay/rbd_replay_debug.hpp b/src/rbd_replay/rbd_replay_debug.hpp
index 4b44588b4b66751c16da23e86043e83711ffd115..1e373136a540290fabab2bca52ae9e2951137a80 100644 (file)
--- a/src/rbd_replay/rbd_replay_debug.hpp
+++ b/src/rbd_replay/rbd_replay_debug.hpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *

diff --git a/src/rgw/driver/posix/bucket_cache.cpp b/src/rgw/driver/posix/bucket_cache.cpp
index 9df08e40a137f3294461be2ed7725b5d94da347a..f9b0817b1a3757a593b8c99eef0756bb4417891b 100644 (file)
--- a/src/rgw/driver/posix/bucket_cache.cpp
+++ b/src/rgw/driver/posix/bucket_cache.cpp
@@ -1,4 +1,4 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab ft=cpp
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab ft=cpp
 #include "bucket_cache.h"
 

diff --git a/src/rgw/driver/posix/notify.cpp b/src/rgw/driver/posix/notify.cpp
index 8030caa93d9ca562f5105d5806d2a09ee2d1b228..5aeb7d76d5627381c91b5c08490e00bf862bfd42 100644 (file)
--- a/src/rgw/driver/posix/notify.cpp
+++ b/src/rgw/driver/posix/notify.cpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab ft=cpp
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab ft=cpp
 
 #include "notify.h"
 #ifdef linux

diff --git a/src/rgw/rgw_iam_policy_keywords.gperf b/src/rgw/rgw_iam_policy_keywords.gperf
index d81218b9ea9fb39b72fdfb6362b4ac92e813c2d5..6151d921a4c0344a2c0604ab5f95b99f9b67d54a 100644 (file)
--- a/src/rgw/rgw_iam_policy_keywords.gperf
+++ b/src/rgw/rgw_iam_policy_keywords.gperf
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 %language=C++
 %compare-strncmp
 %define class-name keyword_hash

diff --git a/src/rgw/rgwam.py b/src/rgw/rgwam.py
index f07d2b423e73a708cc311a7013531f2cab6f0e0e..50598e272348191d0880206f5489b55945315850 100755 (executable)
--- a/src/rgw/rgwam.py
+++ b/src/rgw/rgwam.py
@@ -1,6 +1,6 @@
 #!@Python3_EXECUTABLE@
 # -*- mode:python -*-
-# vim: ts=4 sw=4 smarttab expandtab
+# vim: ts=4 sw=4 expandtab
 #
 # Processed in Makefile to add python #! line and version variable
 #

diff --git a/src/test/common/test_decode_start_v_checker.cpp b/src/test/common/test_decode_start_v_checker.cpp
index e56ad06a76682b7ba74c5551a011b39db76afef9..53c69acf1434631c5d0548a6557cb1417954584f 100644 (file)
--- a/src/test/common/test_decode_start_v_checker.cpp
+++ b/src/test/common/test_decode_start_v_checker.cpp
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab ft=cpp
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab ft=cpp
 
 /*
  * Ceph - scalable distributed file system

diff --git a/src/test/objectstore/run_seed_to.sh b/src/test/objectstore/run_seed_to.sh
index 5a624a5d4530cc241f2a1c86e676f22f56e7db20..13aacea2bf05df15fedbdd2b7a21a89d34e2fa2a 100755 (executable)
--- a/src/test/objectstore/run_seed_to.sh
+++ b/src/test/objectstore/run_seed_to.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# vim: ts=8 sw=2 smarttab
+# vim: ts=8 sw=2 sts=2 expandtab
 #
 # run_seed_to.sh - Run ceph_test_filestore_idempotent_sequence up until an 
 # injection point, generating a sequence of operations based on a

diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index 630e6046b243d419ac92deb8fe525c3c189c7c6d..14b61997f641d9c738db00511384a9f289a58696 100755 (executable)
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- mode:python; tab-width:4; indent-tabs-mode:nil; coding:utf-8 -*-
-# vim: ts=4 sw=4 smarttab expandtab fileencoding=utf-8
+# vim: ts=4 sw=4 expandtab fileencoding=utf-8
 #
 # Ceph - scalable distributed file system
 #

diff --git a/src/test/pybind/test_ceph_daemon.py b/src/test/pybind/test_ceph_daemon.py
index df8d4c0b09b91548069e7f0efdfcf53d5889a4c1..67eeb0def8c1f3ae247030fc33c3fff59f3d156f 100755 (executable)
--- a/src/test/pybind/test_ceph_daemon.py
+++ b/src/test/pybind/test_ceph_daemon.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
-# -*- mode:python; tab-width:4; indent-tabs-mode:t -*-
-# vim: ts=4 sw=4 smarttab expandtab
+# -*- mode:python; tab-width:4; indent-tabs-mode:nil -*-
+# vim: ts=4 sw=4 expandtab
 #
 """
 Copyright (C) 2015 Red Hat

diff --git a/src/test/pybind/test_cephfs.py b/src/test/pybind/test_cephfs.py
index 14814c1c53f42dd98b41400ee82d9ace7889906b..b8ffbc6e34587c80addd922976de4dd8c01684f1 100644 (file)
--- a/src/test/pybind/test_cephfs.py
+++ b/src/test/pybind/test_cephfs.py
@@ -1,4 +1,4 @@
-# vim: expandtab smarttab shiftwidth=4 softtabstop=4
+# vim: expandtab shiftwidth=4 softtabstop=4
 import collections
 collections.Callable = collections.abc.Callable
 from assertions import assert_raises, assert_equal, assert_not_equal, assert_greater

diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py
index 7bfa754b0d568c0625e13be10fe82d19b7bbff25..1fbb5a49ca815e978df527e806f3d6f3e895812b 100644 (file)
--- a/src/test/pybind/test_rbd.py
+++ b/src/test/pybind/test_rbd.py
@@ -1,4 +1,4 @@
-# vim: expandtab smarttab shiftwidth=4 softtabstop=4
+# vim: expandtab shiftwidth=4 softtabstop=4
 import base64
 import copy
 import errno

diff --git a/src/test/pybind/test_rgwfs.py b/src/test/pybind/test_rgwfs.py
index 0e0fcce4475e5c625990e203c7c406cd7d27ea3b..a86176956cbbdb0ffd664cf4b6111d6944bf81ae 100644 (file)
--- a/src/test/pybind/test_rgwfs.py
+++ b/src/test/pybind/test_rgwfs.py
@@ -1,4 +1,4 @@
-# vim: expandtab smarttab shiftwidth=4 softtabstop=4
+# vim: expandtab shiftwidth=4 softtabstop=4
 import pytest
 from assertions import assert_raises, assert_equal
 import rgw as librgwfs

diff --git a/src/test/test_c_headers.c b/src/test/test_c_headers.c
index fc83a82a2bcf91e2823e50f6fe73c897c3d77e75..b491d20ec272941dde9239926dd09a1dc0c01b9d 100644 (file)
--- a/src/test/test_c_headers.c
+++ b/src/test/test_c_headers.c
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:2; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=2 sw=2 smarttab
+// -*- mode:C++; tab-width:2; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=2 sw=2 sts=2 expandtab
 
 #include <stdlib.h>
 #include "include/cephfs/libcephfs.h"

diff --git a/src/tools/rbd_ggate/ggate_drv.c b/src/tools/rbd_ggate/ggate_drv.c
index 813faf34c579207180a8d54944d018f19fcaf88b..eef4373b03d6b734334e5b8d568d4765a4224de9 100644 (file)
--- a/src/tools/rbd_ggate/ggate_drv.c
+++ b/src/tools/rbd_ggate/ggate_drv.c
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 
 #include <sys/param.h>
 #include <sys/bio.h>

diff --git a/src/tools/scratchtool.c b/src/tools/scratchtool.c
index 70aeb6d89f0dbe9d7892a162c7172c23ee9fc8dd..1613bc7494dc3cfe8e43581ee212dbee6b7f7d54 100644 (file)
--- a/src/tools/scratchtool.c
+++ b/src/tools/scratchtool.c
@@ -1,5 +1,5 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
+// vim: ts=8 sw=2 sts=2 expandtab
 /*
  * Ceph - scalable distributed file system
  *