From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 10 Jan 2020 20:15:42 +0000 (-0800)
Subject: Merge pull request #30761 from smithfarm/wip-41899-nautilus
X-Git-Tag: v14.2.8~20^2~68
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=916eec9f1f8de019587be48afcdc841245e9526f;p=ceph.git

Merge pull request #30761 from smithfarm/wip-41899-nautilus

nautilus: mds: "apply configuration changes through MDSRank" and "recall caps from quiescent sessions" and "drive cap recall while dropping cache"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

916eec9f1f8de019587be48afcdc841245e9526f
diff --cc src/include/rados.h
index 6cf951f2d8f,6c8465277da..bbcf086724f
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@@ -7,16 -7,9 +7,17 @@@
   */
  
  #include <string.h>
+ #include <stdbool.h>
  #include "msgr.h"
  
 +/* See comment in ceph_fs.h.  */
 +#ifndef __KERNEL__
 +#include "byteorder.h"
 +#define __le16 ceph_le16
 +#define __le32 ceph_le32
 +#define __le64 ceph_le64
 +#endif
 +
  /*
   * fs id
   */