Merge PR ceph#66036 into main

* refs/pull/66036/head:

Reviewed-by: Dhairya Parmar <[email protected]>
Reviewed-by: Christopher Hoffman <[email protected]>

Author: vshankar

src/client/Client.cc

@@ -3882,7 +3882,9 @@ void Client::put_cap_ref(Inode *in, int cap)
 	  p.second.dirty_data = 0;
 	signal_context_list(in->waitfor_commit);
 	ldout(cct, 5) << __func__ << " dropped last FILE_BUFFER ref on " << *in << dendl;
-	++put_nref;
+        if (!in->is_write_delegated()) {
+          ++put_nref;
+        }
 
 	if (!in->cap_snaps.empty()) {
 	  flush_snaps(in);
@@ -13306,13 +13308,9 @@ int Client::_fsync(Inode *in, bool syncdataonly)
     ldout(cct, 15) << "got " << r << " from flush writeback" << dendl;
   } else {
     // FIXME: this can starve
-    int nr_refs = 0;
-    if (in->is_write_delegated()) {
-      ++nr_refs;
-    }
-    while (in->cap_refs[CEPH_CAP_FILE_BUFFER] > nr_refs) {
+    while (!in->is_last_cap_ref(CEPH_CAP_FILE_BUFFER)) {
       ldout(cct, 10) << "ino " << in->ino << " has " << in->cap_refs[CEPH_CAP_FILE_BUFFER]
-		     << " uncommitted (nrefs: " << nr_refs << "), waiting" << dendl;
+		     << " uncommitted, waiting" << dendl;
       wait_on_context_list(in->waitfor_commit);
     }
   }

src/client/Inode.cc

@@ -198,6 +198,20 @@ void Inode::get_cap_ref(int cap)
   }
 }
 
+bool Inode::is_last_cap_ref(int c)
+{
+  if (c != CEPH_CAP_FILE_BUFFER) {
+    return cap_refs[c] == 0;
+  }
+
+  int nref = 0;
+  if (is_write_delegated()) {
+    ++nref;
+  }
+
+  return cap_refs[c] == nref;
+}
+
 int Inode::put_cap_ref(int cap)
 {
   int last = 0;
@@ -209,7 +223,8 @@ int Inode::put_cap_ref(int cap)
 	lderr(client->cct) << "put_cap_ref " << ccap_string(c) << " went negative on " << *this << dendl;
 	ceph_assert(cap_refs[c] > 0);
       }
-      if (--cap_refs[c] == 0)
+      --cap_refs[c];
+      if (is_last_cap_ref(c))
         last |= c;
       //cout << "inode " << *this << " put " << cap_string(c) << " " << (cap_refs[c]+1) << " -> " << cap_refs[c] << std::endl;
     }

src/client/Inode.h

@@ -343,6 +343,7 @@ struct Inode : RefCountedObject {
 
   void get_cap_ref(int cap);
   int put_cap_ref(int cap);
+  bool is_last_cap_ref(int c);
   bool is_any_caps();
   bool cap_is_valid(const Cap &cap) const;
   int caps_issued(int *implemented = 0) const;