diff options
author | Sage Weil <sage@newdream.net> | 2010-05-14 12:35:38 -0400 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-05-17 13:25:45 -0400 |
commit | 81a6cf2d30eac5d790f53cdff110892f7b18c7fe (patch) | |
tree | 9dcc1d4492b8736cda6a007a4a1c076048bd87af /fs/ceph/mds_client.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/mds_client.c')
-rw-r--r-- | fs/ceph/mds_client.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index c0568fe3c0b..76995a96043 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
@@ -1732,12 +1732,17 @@ int ceph_mdsc_do_request(struct ceph_mds_client *mdsc, | |||
1732 | struct ceph_inode_info *ci = | 1732 | struct ceph_inode_info *ci = |
1733 | ceph_inode(req->r_locked_dir); | 1733 | ceph_inode(req->r_locked_dir); |
1734 | 1734 | ||
1735 | dout("aborted, clearing I_COMPLETE on %p\n", | 1735 | dout("aborted, clearing I_COMPLETE on %p, leases\n", |
1736 | req->r_locked_dir); | 1736 | req->r_locked_dir); |
1737 | spin_lock(&req->r_locked_dir->i_lock); | 1737 | spin_lock(&req->r_locked_dir->i_lock); |
1738 | ci->i_ceph_flags &= ~CEPH_I_COMPLETE; | 1738 | ci->i_ceph_flags &= ~CEPH_I_COMPLETE; |
1739 | ci->i_release_count++; | 1739 | ci->i_release_count++; |
1740 | spin_unlock(&req->r_locked_dir->i_lock); | 1740 | spin_unlock(&req->r_locked_dir->i_lock); |
1741 | |||
1742 | if (req->r_dentry) | ||
1743 | ceph_invalidate_dentry_lease(req->r_dentry); | ||
1744 | if (req->r_old_dentry) | ||
1745 | ceph_invalidate_dentry_lease(req->r_old_dentry); | ||
1741 | } | 1746 | } |
1742 | } else { | 1747 | } else { |
1743 | err = req->r_err; | 1748 | err = req->r_err; |