ceph: unify cap flush and snapcap flush

This patch includes following changes
- Assign flush tid to snapcap flush
- Remove session's s_cap_snaps_flushing list. Add inode to session's
  s_cap_flushing list instead. Inode is removed from the list when
  there is no pending snapcap flush or cap flush.
- make __kick_flushing_caps() re-send both snapcap flushes and cap
  flushes.

Signed-off-by: Yan, Zheng <zyan@redhat.com>

1 files changed, 1 insertions, 3 deletions

diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c
index eadf2c33edc6..20d5b0cdf655 100644
--- a/fs/ceph/snap.c
+++ b/fs/ceph/snap.c
@@ -520,9 +520,7 @@ void ceph_queue_cap_snap(struct ceph_inode_info *ci)
         ihold(inode);
 
         atomic_set(&capsnap->nref, 1);
-        capsnap->ci = ci;
         INIT_LIST_HEAD(&capsnap->ci_item);
-        INIT_LIST_HEAD(&capsnap->flushing_item);
 
         capsnap->follows = old_snapc->seq;
         capsnap->issued = __ceph_caps_issued(ci, NULL);
@@ -800,7 +798,7 @@ static void flush_snaps(struct ceph_mds_client *mdsc)
                 ihold(inode);
                 spin_unlock(&mdsc->snap_flush_lock);
                 spin_lock(&ci->i_ceph_lock);
-                __ceph_flush_snaps(ci, &session, 0);
+                __ceph_flush_snaps(ci, &session);
                 spin_unlock(&ci->i_ceph_lock);
                 iput(inode);
                 spin_lock(&mdsc->snap_flush_lock);