Minor cleanups in navy

Summary:
- Use std::max instead of manually calculating max
- Remove unused header
- Fix bad grammar in comments

Reviewed By: AlnisM

Differential Revision: D97170969

fbshipit-source-id: cedd24ceaf675328f65547416ec303ad8359ea65

Author: rlyerly

cachelib/navy/driver/Driver.h

@@ -28,7 +28,6 @@
 #include "cachelib/navy/admission_policy/AdmissionPolicy.h"
 #include "cachelib/navy/common/Buffer.h"
 #include "cachelib/navy/common/Device.h"
-#include "cachelib/navy/engine/Engine.h"
 #include "cachelib/navy/engine/EnginePair.h"
 #include "cachelib/navy/scheduler/JobScheduler.h"
 
@@ -126,10 +125,10 @@ class Driver final : public AbstractCache {
   // @param cb   a callback function be triggered when the remove complete.
   void removeAsync(HashedKey key, RemoveCallback cb) override;
 
-  // ensure all pending job have been completed
+  // ensure all pending jobs have been completed
   void drain() override;
 
-  // ensure all pending job have been completed and data has been flush to
+  // ensure all pending jobs have been completed and data has been flushed to
   // device(s).
   void flush() override;
 

cachelib/navy/serialization/RecordIO.cpp

@@ -67,9 +67,8 @@ class DeviceMetaDataWriter final : public RecordWriter {
   explicit DeviceMetaDataWriter(Device& dev, size_t metadataSize)
       : dev_(dev),
         metadataSize_{metadataSize},
-        blockSize_{dev_.getIOAlignmentSize() >= kBlockSizeDefault
-                       ? dev_.getIOAlignmentSize()
-                       : kBlockSizeDefault} {}
+        blockSize_{
+            std::max<size_t>(dev_.getIOAlignmentSize(), kBlockSizeDefault)} {}
 
   ~DeviceMetaDataWriter() override {
     uint8_t* bufferData = buffer_.data();
@@ -174,9 +173,8 @@ class DeviceMetaDataReader final : public RecordReader {
   explicit DeviceMetaDataReader(Device& dev, size_t metadataSize)
       : dev_{dev},
         metadataSize_{metadataSize},
-        blockSize_{dev_.getIOAlignmentSize() >= kBlockSizeDefault
-                       ? dev_.getIOAlignmentSize()
-                       : kBlockSizeDefault} {}
+        blockSize_{
+            std::max<size_t>(dev_.getIOAlignmentSize(), kBlockSizeDefault)} {}
   ~DeviceMetaDataReader() override = default;
 
   std::unique_ptr<folly::IOBuf> readRecord() override {