]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #30761 from smithfarm/wip-41899-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Fri, 10 Jan 2020 20:15:42 +0000 (12:15 -0800)
committerGitHub <noreply@github.com>
Fri, 10 Jan 2020 20:15:42 +0000 (12:15 -0800)
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>
1  2 
src/client/Client.cc
src/common/options.cc
src/include/rados.h
src/mds/Locker.cc
src/mds/MDCache.cc
src/mds/MDSRank.cc
src/mds/MDSRank.h
src/mds/locks.c

Simple merge
Simple merge
index 6cf951f2d8fab5e727fdaabf9106ddee89c48115,6c8465277da22231520c3d8a1c95b73a94fe232b..bbcf086724f4a3fc14fb0db288683982e536265d
@@@ -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
   */
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/mds/locks.c
Simple merge