From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 8 Feb 2018 21:05:05 +0000 (-0800)
Subject: Merge PR #20200 into master
X-Git-Tag: v13.0.2~319
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=06b176b362d53d58480d6a32898754b9be0fd75d;p=ceph.git

Merge PR #20200 into master

* refs/pull/20200/head:
	client: add cap_dirtier_uid/gid to CapSnap

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

06b176b362d53d58480d6a32898754b9be0fd75d
diff --cc src/client/Client.cc
index 4265fa79b604,a7f84be9ff9a..e9fca59a57fe
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@@ -3502,9 -3504,11 +3502,11 @@@ void Client::queue_cap_snap(Inode *in, 
      capsnap.btime = in->btime;
      capsnap.xattrs = in->xattrs;
      capsnap.xattr_version = in->xattr_version;
+     capsnap.cap_dirtier_uid = in->cap_dirtier_uid;
+     capsnap.cap_dirtier_gid = in->cap_dirtier_gid;
   
      if (used & CEPH_CAP_FILE_WR) {
 -      ldout(cct, 10) << "queue_cap_snap WR used on " << *in << dendl;
 +      ldout(cct, 10) << __func__ << " WR used on " << *in << dendl;
        capsnap.writing = 1;
      } else {
        finish_cap_snap(in, capsnap, used);