diff --git a/paddle/fluid/framework/common/fs.cc b/paddle/fluid/framework/common/fs.cc
index 295b2d3c5405367b9a229d870ed64d58f0a1d6d8..62db2a2bd0b8e67b4096bcf57e4c5043373d7cad 100644
--- a/paddle/fluid/framework/common/fs.cc
+++ b/paddle/fluid/framework/common/fs.cc
@@ -63,15 +63,14 @@ static std::shared_ptr<FILE> fs_open_internal(const std::string& path,
   if (buffer_size > 0) {
     char* buffer = new char[buffer_size];
     CHECK_EQ(0, setvbuf(&*fp, buffer, _IOFBF, buffer_size));
-    fp = {&*fp,
-          [ fp, buffer ] reinterpret_cast<FILE*> mutable {CHECK(fp.unique());
-    fp = nullptr;
-    delete[] buffer;
+    fp = {&*fp, [fp, buffer](FILE*) mutable {  // NOLINT
+            CHECK(fp.unique());                // NOLINT
+            fp = nullptr;
+            delete[] buffer;
+          }};
   }
-};
-}
 
-return fp;
+  return fp;
 }
 
 static bool fs_begin_with_internal(const std::string& path,
diff --git a/paddle/fluid/framework/common/shell.cc b/paddle/fluid/framework/common/shell.cc
index 6e423d9071928aae999a927906363d00938b7ebb..ff6e828aa1578e33c0fbe53ca90eadf18f53e3b2 100644
--- a/paddle/fluid/framework/common/shell.cc
+++ b/paddle/fluid/framework/common/shell.cc
@@ -41,9 +41,9 @@ std::shared_ptr<FILE> shell_fopen(const std::string& path,
 // Mostly copy from CPython code
 static int close_open_fds_internal() {
   struct linux_dirent {
-    int64 d_ino = 0;
+    long d_ino = 0;  // NOLINT
     off_t d_off;
-    uint16 d_reclen = 0;
+    unsigned short d_reclen = 0;  // NOLINT
     char d_name[256];
   };
 
diff --git a/paddle/fluid/framework/data_feed.cc b/paddle/fluid/framework/data_feed.cc
index 0703851d2043e1cdebe7873ab037516e26114d17..e37e596565470cc8f2daad278b6668ee91d615cc 100644
--- a/paddle/fluid/framework/data_feed.cc
+++ b/paddle/fluid/framework/data_feed.cc
@@ -95,7 +95,7 @@ template <typename T>
 bool PrivateQueueDataFeed<T>::Start() {
   CheckSetFileList();
   std::string filename;
-  while (PickOneFile(&filename)) {
+  if (PickOneFile(&filename)) {
     int err_no = 0;
     std::string pipeline_cmd = "cat";