RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 05:00:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: cancel tick timer on unmount, clean up debug output

Browse Source
This commit is contained in:
Sage Weil 2008-04-01 07:02:33 -07:00
parent f626b9c9e2
commit 73cbeca5d5
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/Client.cc
View File

@ -391,7 +391,7 @@ Inode* Client::insert_dentry_inode(Dir *dir, const string& dname, LeaseStat *dle
if (dir->dentries.count(dname))
dn = dir->dentries[dname];
dout(12) << "insert_dentry_inode " << dname << " ino " << ist->ino
dout(12) << "insert_dentry_inode " << dname << " ino " << ist->ino
<< " size " << ist->size
<< " mtime " << ist->mtime
<< " dmask " << dmask
@ -1694,6 +1694,9 @@ int Client::unmount()
dout(2) << "unmounting" << dendl;
unmounting = true;
timer.cancel_event(tick_event);
tick_event = 0;
// NOTE: i'm assuming all caches are already flushing (because all files are closed).
assert(fd_map.empty());

4
src/messages/MClientLease.h
View File

@ -35,7 +35,7 @@ struct MClientLease : public Message {
int get_action() { return h.action; }
int get_mask() { return le16_to_cpu(h.mask); }
__u64 get_ino() { return le64_to_cpu(h.ino); }
inodeno_t get_ino() { return inodeno_t(le64_to_cpu(h.ino)); }
MClientLease() : Message(CEPH_MSG_CLIENT_LEASE) {}
MClientLease(int ac, int m, __u64 i) :
@ -56,7 +56,7 @@ struct MClientLease : public Message {
void print(ostream& out) {
out << "client_lease(a=" << get_lease_action_name(get_action())
<< " mask " << get_mask();
out << " " << inodeno_t(get_ino());
out << " " << get_ino();
if (dname.length())
out << "/" << dname;
out << ")";

2
src/messages/MClientReply.h
View File

@ -99,7 +99,7 @@ struct DirStat {
struct InodeStat {
//inode_t inode;
__u64 ino;
inodeno_t ino;
ceph_file_layout layout;
utime_t ctime, mtime, atime;
unsigned mode, uid, gid, nlink, rdev;