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/dir.c | |
| parent | b4556396fac5b3f063d5b8ac54dc02f7612a75e1 (diff) | |
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/dir.c')
| -rw-r--r-- | fs/ceph/dir.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 650d2db5ed2..4b1a7a4bae0 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -888,13 +888,22 @@ static int ceph_rename(struct inode *old_dir, struct dentry *old_dentry, /* ensure target dentry is invalidated, despite rehashing bug in vfs_rename_dir */ - new_dentry->d_time = jiffies; - ceph_dentry(new_dentry)->lease_shared_gen = 0; + ceph_invalidate_dentry_lease(new_dentry); } ceph_mdsc_put_request(req); return err; } +/* + * Ensure a dentry lease will no longer revalidate. + */ +void ceph_invalidate_dentry_lease(struct dentry *dentry) +{ + spin_lock(&dentry->d_lock); + dentry->d_time = jiffies; + ceph_dentry(dentry)->lease_shared_gen = 0; + spin_unlock(&dentry->d_lock); +} /* * Check if dentry lease is valid. If not, delete the lease. Try to |