diff --git a/examples/librados/hello_world_c.c b/examples/librados/hello_world_c.c index 2f91828dee8..c91273e02ef 100644 --- a/examples/librados/hello_world_c.c +++ b/examples/librados/hello_world_c.c @@ -1,5 +1,6 @@ -// -*- 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 bfe57eac03e..14bf3d84e78 100755 --- a/qa/standalone/scrub/osd-mapper.sh +++ b/qa/standalone/scrub/osd-mapper.sh @@ -1,6 +1,7 @@ #!/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 2834cb666fe..57ec1fa0a09 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -1,6 +1,7 @@ #!/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 32866f73166..6fb65dcf8cb 100755 --- 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 b5c81a8d86b..8b93f666ca1 100755 --- 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 # diff --git a/src/arch/s390x.c b/src/arch/s390x.c index dec654ef7d9..43b30c29f53 100644 --- a/src/arch/s390x.c +++ b/src/arch/s390x.c @@ -1,5 +1,6 @@ -// -*- 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 8c7523e607a..9e2c5f09d60 100644 --- a/src/auth/krb/KrbAuthorizeHandler.cpp +++ b/src/auth/krb/KrbAuthorizeHandler.cpp @@ -1,5 +1,6 @@ -// -*- 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 448b682e68d..b93a088c4d4 100644 --- a/src/auth/krb/KrbAuthorizeHandler.hpp +++ b/src/auth/krb/KrbAuthorizeHandler.hpp @@ -1,5 +1,6 @@ -// -*- 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 1f728b4dd6e..70ccacabea6 100644 --- a/src/auth/krb/KrbClientHandler.cpp +++ b/src/auth/krb/KrbClientHandler.cpp @@ -1,5 +1,6 @@ -// -*- 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 58e5311167a..28ec3b84e22 100644 --- a/src/auth/krb/KrbClientHandler.hpp +++ b/src/auth/krb/KrbClientHandler.hpp @@ -1,5 +1,6 @@ -// -*- 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 6988d35566d..c83881c91a5 100644 --- a/src/auth/krb/KrbProtocol.cpp +++ b/src/auth/krb/KrbProtocol.cpp @@ -1,5 +1,6 @@ -// -*- 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 abddb584878..5827623830f 100644 --- a/src/auth/krb/KrbProtocol.hpp +++ b/src/auth/krb/KrbProtocol.hpp @@ -1,5 +1,6 @@ -// -*- 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 c2ca3bbf28c..157ed83a885 100644 --- a/src/auth/krb/KrbServiceHandler.cpp +++ b/src/auth/krb/KrbServiceHandler.cpp @@ -1,5 +1,6 @@ -// -*- 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 85cf5a1a6e6..ca8bf24687c 100644 --- a/src/auth/krb/KrbServiceHandler.hpp +++ b/src/auth/krb/KrbServiceHandler.hpp @@ -1,5 +1,6 @@ -// -*- 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 ee80d790933..c69b7932cae 100644 --- a/src/auth/krb/KrbSessionHandler.hpp +++ b/src/auth/krb/KrbSessionHandler.hpp @@ -1,5 +1,6 @@ -// -*- 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 0e02837fadd..52303c3e8a5 100755 --- 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 073be6467dc..4cd9b7e21ab 100644 --- 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 51743dd9ae8..6c8a1e944ca 100755 --- 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 0e183c667c2..56691792274 100644 --- a/src/common/addr_parsing.c +++ b/src/common/addr_parsing.c @@ -1,5 +1,6 @@ -// -*- 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 e6df71c86f4..0294354440d 100644 --- a/src/common/bit_vector.hpp +++ b/src/common/bit_vector.hpp @@ -1,5 +1,6 @@ -// -*- 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 8fe1e4ee5e9..6fed5009073 100644 --- 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 93bda03a252..3952cf9bb75 100644 --- a/src/common/map_cacher.hpp +++ b/src/common/map_cacher.hpp @@ -1,5 +1,6 @@ -// -*- 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 fe45123ccc9..e0182a2dc1c 100644 --- a/src/common/mime.c +++ b/src/common/mime.c @@ -1,5 +1,6 @@ -// -*- 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 f65540d54fa..05eb3bf15f2 100644 --- a/src/common/reverse.c +++ b/src/common/reverse.c @@ -1,5 +1,6 @@ -// -*- 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 80921d0f2e4..3f63b80b0c6 100644 --- a/src/common/safe_io.c +++ b/src/common/safe_io.c @@ -1,5 +1,6 @@ -// -*- 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 fe34efdff83..96f2333dcca 100644 --- a/src/common/secret.c +++ b/src/common/secret.c @@ -1,5 +1,6 @@ -// -*- 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 d285e370ba5..00361903a1a 100644 --- a/src/common/shared_cache.hpp +++ b/src/common/shared_cache.hpp @@ -1,5 +1,6 @@ -// -*- 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 8c0db6c24a7..b7a6c6b80eb 100644 --- a/src/common/sharedptr_registry.hpp +++ b/src/common/sharedptr_registry.hpp @@ -1,5 +1,6 @@ -// -*- 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 07d19a731b1..12a076a7368 100644 --- a/src/common/simple_cache.hpp +++ b/src/common/simple_cache.hpp @@ -1,5 +1,6 @@ -// -*- 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 fc54c4cb9d6..f77b1bd7722 100644 --- a/src/common/tracked_int_ptr.hpp +++ b/src/common/tracked_int_ptr.hpp @@ -1,5 +1,6 @@ -// -*- 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 3a05789f603..6c8bc1e1907 100644 --- a/src/common/utf8.c +++ b/src/common/utf8.c @@ -1,5 +1,6 @@ -// -*- 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 bccdb81533b..65f0a00ce6c 100644 --- a/src/doc/header.txt +++ b/src/doc/header.txt @@ -1,5 +1,6 @@ -// -*- 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 1b3956f4d48..d6402e4b05a 100644 --- a/src/doc/modeline.txt +++ b/src/doc/modeline.txt @@ -1,2 +1,3 @@ -// -*- 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 15b62c9efcf..f923e7db0a5 100644 --- a/src/erasure-code/shec/determinant.c +++ b/src/erasure-code/shec/determinant.c @@ -1,5 +1,6 @@ -// -*- 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 4b595258ca8..79b396de1f2 100644 --- a/src/include/neorados/RADOS.hpp +++ b/src/include/neorados/RADOS.hpp @@ -1,5 +1,6 @@ -// -*- 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 777a2525c8e..367e41335d8 100644 --- a/src/include/neorados/RADOS_Decodable.hpp +++ b/src/include/neorados/RADOS_Decodable.hpp @@ -1,5 +1,6 @@ -// -*- 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 0ac315a76f4..42b80ce497b 100644 --- a/src/include/rbd/librbd.hpp +++ b/src/include/rbd/librbd.hpp @@ -1,5 +1,6 @@ -// -*- 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 0a70e92bc93..b470eb1fdfa 100644 --- 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 159abdc99a5..68613b389ed 100755 --- 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 9b19865bfc5..e11eb8e528a 100644 --- 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 6185d26663e..d0b6f8f1308 100644 --- 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 45cdaf68694..5391c4569a8 100644 --- a/src/rbd_replay/ImageNameMap.hpp +++ b/src/rbd_replay/ImageNameMap.hpp @@ -1,5 +1,6 @@ -// -*- 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 3942d5f6fd9..2504d9fa8e9 100644 --- a/src/rbd_replay/PendingIO.hpp +++ b/src/rbd_replay/PendingIO.hpp @@ -1,5 +1,6 @@ -// -*- 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 02bca019c71..6c5f735a689 100644 --- a/src/rbd_replay/Replayer.hpp +++ b/src/rbd_replay/Replayer.hpp @@ -1,5 +1,6 @@ -// -*- 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 3b5dd8bd789..aab22ea5203 100644 --- a/src/rbd_replay/actions.hpp +++ b/src/rbd_replay/actions.hpp @@ -1,5 +1,6 @@ -// -*- 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 8a105afd2d7..c1f6a941300 100644 --- a/src/rbd_replay/ios.hpp +++ b/src/rbd_replay/ios.hpp @@ -1,5 +1,6 @@ -// -*- 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 8b7bfac1f2b..0d138d90b26 100644 --- a/src/rbd_replay/rbd_loc.hpp +++ b/src/rbd_replay/rbd_loc.hpp @@ -1,5 +1,6 @@ -// -*- 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 4b44588b4b6..ac965ec34c1 100644 --- a/src/rbd_replay/rbd_replay_debug.hpp +++ b/src/rbd_replay/rbd_replay_debug.hpp @@ -1,5 +1,6 @@ -// -*- 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 9df08e40a13..2897a6fb751 100644 --- a/src/rgw/driver/posix/bucket_cache.cpp +++ b/src/rgw/driver/posix/bucket_cache.cpp @@ -1,4 +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 "bucket_cache.h" diff --git a/src/rgw/driver/posix/notify.cpp b/src/rgw/driver/posix/notify.cpp index 8030caa93d9..5aeb7d76d56 100644 --- 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 d81218b9ea9..e8480aa05e8 100644 --- a/src/rgw/rgw_iam_policy_keywords.gperf +++ b/src/rgw/rgw_iam_policy_keywords.gperf @@ -1,5 +1,6 @@ -// -*- 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 f07d2b423e7..50598e27234 100755 --- 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 e56ad06a766..53c69acf143 100644 --- 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 5a624a5d453..13aacea2bf0 100755 --- 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 630e6046b24..c5af9228f57 100755 --- a/src/test/pybind/test_ceph_argparse.py +++ b/src/test/pybind/test_ceph_argparse.py @@ -1,6 +1,7 @@ #!/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 df8d4c0b09b..1a515bc0282 100755 --- a/src/test/pybind/test_ceph_daemon.py +++ b/src/test/pybind/test_ceph_daemon.py @@ -1,6 +1,7 @@ #!/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 26de6577415..f659c91ae44 100644 --- 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 7bfa754b0d5..1fbb5a49ca8 100644 --- 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 0e0fcce4475..a86176956cb 100644 --- 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 fc83a82a2bc..b491d20ec27 100644 --- 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 #include "include/cephfs/libcephfs.h" diff --git a/src/tools/rbd_ggate/ggate_drv.c b/src/tools/rbd_ggate/ggate_drv.c index 813faf34c57..eef4373b03d 100644 --- 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 #include diff --git a/src/tools/scratchtool.c b/src/tools/scratchtool.c index 70aeb6d89f0..7c90368d326 100644 --- a/src/tools/scratchtool.c +++ b/src/tools/scratchtool.c @@ -1,5 +1,6 @@ -// -*- 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 *