From d0041ee81cc2838e0a5af07e092b59ae05a1920e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 15 Dec 2008 16:40:08 -0800 Subject: [PATCH] mds: remove follows==0 special cases A follows==0 shouldn't have any special meaning anymore. See also 1876ca5ad4b92f0794c91d15502c16ad747dbf8b. --- src/mds/MDCache.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 09a5f41196fbb..708f2fd358c75 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -1068,7 +1068,7 @@ void MDCache::journal_cow_dentry(Mutation *mut, EMetaBlob *metablob, CDentry *dn // multiversion inode. CInode *in = dn->inode; - if (follows == CEPH_NOSNAP || follows == 0) + if (follows == CEPH_NOSNAP) follows = in->find_snaprealm()->get_newest_snap(); // already cloned? @@ -1443,11 +1443,10 @@ void MDCache::predirty_journal_parents(Mutation *mut, EMetaBlob *blob, // rstat if (primary_dn) { SnapRealm *prealm = parent->inode->find_snaprealm(); - snapid_t latest = prealm->get_newest_snap(); snapid_t follows = cfollows; - if (follows == CEPH_NOSNAP || follows == 0) - follows = latest; + if (follows == CEPH_NOSNAP) + follows = prealm->get_newest_snap(); snapid_t first = follows+1; if (cur->first > first) -- 2.47.3