Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81a6cf2d authored by Sage Weil's avatar Sage Weil
Browse files

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: default avatarSage Weil <sage@newdream.net>
parent b4556396

fs/ceph/dir.c

+11 −2
Original line number Diff line number Diff line
@@ -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

fs/ceph/inode.c

+11 −2
Original line number Diff line number Diff line
@@ -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;

		}

fs/ceph/mds_client.c

+6 −1
Original line number Diff line number Diff line
@@ -1732,12 +1732,17 @@ int ceph_mdsc_do_request(struct ceph_mds_client *mdsc, 
			struct ceph_inode_info *ci =

				ceph_inode(req->r_locked_dir);



			dout("aborted, clearing I_COMPLETE on %p\n",

			dout("aborted, clearing I_COMPLETE on %p, leases\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);

		}

	} else {

		err = req->r_err;

fs/ceph/super.h

+1 −0
Original line number Diff line number Diff line
@@ -871,6 +871,7 @@ extern struct dentry *ceph_finish_lookup(struct ceph_mds_request *req, 
extern void ceph_dentry_lru_add(struct dentry *dn);

extern void ceph_dentry_lru_touch(struct dentry *dn);

extern void ceph_dentry_lru_del(struct dentry *dn);

extern void ceph_invalidate_dentry_lease(struct dentry *dentry);



/*

 * our d_ops vary depending on whether the inode is live,