diff options
| author | Sage Weil <sage@newdream.net> | 2010-05-14 09:35:38 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-05-17 10:25:45 -0700 |
| commit | 81a6cf2d30eac5d790f53cdff110892f7b18c7fe (patch) | |
| tree | 9dcc1d4492b8736cda6a007a4a1c076048bd87af /fs/ceph/inode.c | |
| parent | b4556396fac5b3f063d5b8ac54dc02f7612a75e1 (diff) | |
| download | op-kernel-dev-81a6cf2d30eac5d790f53cdff110892f7b18c7fe.zip op-kernel-dev-81a6cf2d30eac5d790f53cdff110892f7b18c7fe.tar.gz | |
ceph: invalidate affected dentry leases on aborted requests
If we abort a request, we return to caller, but the request may still
complete. And if we hold the dir FILE_EXCL bit, we may not release a
lease when sending a request. A simple un-tar, control-c, un-tar again
will reproduce the bug (manifested as a 'Cannot open: File exists').
Ensure we invalidate affected dentry leases (as well dir I_COMPLETE) so
we don't have valid (but incorrect) leases. Do the same, consistently, at
other sites where I_COMPLETE is similarly cleared.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/inode.c')
| -rw-r--r-- | fs/ceph/inode.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 85b4d2f..220a2ae 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -938,8 +938,15 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req, ceph_inode(req->r_locked_dir); dout(" clearing %p complete (empty trace)\n", req->r_locked_dir); + spin_lock(&req->r_locked_dir->i_lock); ci->i_ceph_flags &= ~CEPH_I_COMPLETE; ci->i_release_count++; + spin_unlock(&req->r_locked_dir->i_lock); + + if (req->r_dentry) + ceph_invalidate_dentry_lease(req->r_dentry); + if (req->r_old_dentry) + ceph_invalidate_dentry_lease(req->r_old_dentry); } return 0; } @@ -1011,13 +1018,15 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req, req->r_old_dentry->d_name.len, req->r_old_dentry->d_name.name, dn, dn->d_name.len, dn->d_name.name); + /* ensure target dentry is invalidated, despite rehashing bug in vfs_rename_dir */ - dn->d_time = jiffies; - ceph_dentry(dn)->lease_shared_gen = 0; + ceph_invalidate_dentry_lease(dn); + /* take overwritten dentry's readdir offset */ ceph_dentry(req->r_old_dentry)->offset = ceph_dentry(dn)->offset; + dn = req->r_old_dentry; /* use old_dentry */ in = dn->d_inode; } |
