From 716b1f79bcdf9c571d5dc87b37743c5c5dc155a8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 30 Jul 2008 14:11:26 -0700 Subject: [PATCH] mds: remove useless dn dir_offset --- src/mds/CDentry.h | 8 -------- src/mds/CDir.cc | 7 ------- 2 files changed, 15 deletions(-) diff --git a/src/mds/CDentry.h b/src/mds/CDentry.h index 952cd8d4bb87e..187fdd359ee24 100644 --- a/src/mds/CDentry.h +++ b/src/mds/CDentry.h @@ -95,8 +95,6 @@ protected: xlist::item xlist_dirty; - loff_t dir_offset; - int auth_pins, nested_auth_pins; #ifdef MDS_AUTHPIN_SET multiset auth_pin_set; @@ -128,7 +126,6 @@ public: inode(0), dir(0), version(0), projected_version(0), xlist_dirty(this), - dir_offset(0), auth_pins(0), nested_auth_pins(0), nested_anchors(0), lock(this, CEPH_LOCK_DN, WAIT_LOCK_OFFSET) { } CDentry(const nstring& n, inodeno_t ino, unsigned char dt, @@ -139,7 +136,6 @@ public: inode(0), dir(0), version(0), projected_version(0), xlist_dirty(this), - dir_offset(0), auth_pins(0), nested_auth_pins(0), nested_anchors(0), lock(this, CEPH_LOCK_DN, WAIT_LOCK_OFFSET) { } @@ -148,10 +144,6 @@ public: const nstring& get_name() const { return name; } inodeno_t get_ino(); - loff_t get_dir_offset() { return dir_offset; } - void set_dir_offset(loff_t o) { dir_offset = o; } - void clear_dir_offset() { dir_offset = 0; } - inodeno_t get_remote_ino() { return remote_ino; } unsigned char get_remote_d_type() { return remote_d_type; } void set_remote(inodeno_t ino, unsigned char d_type) { diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc index d9ec87c70da3a..61113cffd03ff 100644 --- a/src/mds/CDir.cc +++ b/src/mds/CDir.cc @@ -364,8 +364,6 @@ void CDir::link_remote_inode(CDentry *dn, inodeno_t ino, unsigned char d_type) num_snap_null--; } assert(get_num_any() == items.size()); - - dn->clear_dir_offset(); } void CDir::link_primary_inode(CDentry *dn, CInode *in) @@ -374,7 +372,6 @@ void CDir::link_primary_inode(CDentry *dn, CInode *in) assert(dn->is_null()); link_inode_work(dn,in); - dn->clear_dir_offset(); if (dn->last == CEPH_NOSNAP) num_head_null--; @@ -418,7 +415,6 @@ void CDir::unlink_inode( CDentry *dn ) dout(12) << "unlink_inode " << *dn << " " << *dn->inode << dendl; } - dn->clear_dir_offset(); unlink_inode_work(dn); if (dn->last == CEPH_NOSNAP) @@ -1235,9 +1231,6 @@ void CDir::_fetched(bufferlist &bl) assert(0); } - // make note of dentry position in the directory - dn->dir_offset = dn_offset; - /** clean underwater item? * Underwater item is something that is dirty in our cache from * journal replay, but was previously flushed to disk before the -- 2.39.5