ceph: clean up readdir caps reservation

Use a global counter for the minimum number of allocated caps instead of
hard coding a check against readdir_max.  This takes into account multiple
client instances, and avoids examining the superblock mount options when a
cap is dropped.

Signed-off-by: Sage Weil <sage@newdream.net>

1 files changed, 7 insertions, 6 deletions

diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c
index b58bd9188692..1a47b5c25b5f 100644
--- a/fs/ceph/debugfs.c
+++ b/fs/ceph/debugfs.c
@@ -255,14 +255,15 @@ static int osdc_show(struct seq_file *s, void *pp)
 static int caps_show(struct seq_file *s, void *p)
 {
         struct ceph_client *client = p;
-        int total, avail, used, reserved;
+        int total, avail, used, reserved, min;
 
-        ceph_reservation_status(client, &total, &avail, &used, &reserved);
+        ceph_reservation_status(client, &total, &avail, &used, &reserved, &min);
         seq_printf(s, "total\t\t%d\n"
-                      "avail\t\t%d\n"
-                      "used\t\t%d\n"
-                      "reserved\t%d\n",
-                   total, avail, used, reserved);
+                   "avail\t\t%d\n"
+                   "used\t\t%d\n"
+                   "reserved\t%d\n"
+                   "min\t%d\n",
+                   total, avail, used, reserved, min);
         return 0;
 }