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

Commit 0ea611a3 authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

ceph: rename snapshot support 



Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
parent c0bd50e2

fs/ceph/dir.c

+9 −4
Original line number Diff line number Diff line
@@ -947,16 +947,20 @@ static int ceph_rename(struct inode *old_dir, struct dentry *old_dentry, 
	struct ceph_fs_client *fsc = ceph_sb_to_client(old_dir->i_sb);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_mds_request *req;

	int op = CEPH_MDS_OP_RENAME;

	int err;



	if (ceph_snap(old_dir) != ceph_snap(new_dir))

		return -EXDEV;

	if (ceph_snap(old_dir) != CEPH_NOSNAP ||

	    ceph_snap(new_dir) != CEPH_NOSNAP)

	if (ceph_snap(old_dir) != CEPH_NOSNAP) {

		if (old_dir == new_dir && ceph_snap(old_dir) == CEPH_SNAPDIR)

			op = CEPH_MDS_OP_RENAMESNAP;

		else

			return -EROFS;

	}

	dout("rename dir %p dentry %p to dir %p dentry %p\n",

	     old_dir, old_dentry, new_dir, new_dentry);

	req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_RENAME, USE_AUTH_MDS);

	req = ceph_mdsc_create_request(mdsc, op, USE_AUTH_MDS);

	if (IS_ERR(req))

		return PTR_ERR(req);

	ihold(old_dir);
@@ -1387,6 +1391,7 @@ const struct inode_operations ceph_snapdir_iops = { 
	.getattr = ceph_getattr,

	.mkdir = ceph_mkdir,

	.rmdir = ceph_unlink,

	.rename = ceph_rename,

};



const struct dentry_operations ceph_dentry_ops = {

fs/ceph/strings.c

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ const char *ceph_mds_op_name(int op) 
	case CEPH_MDS_OP_LSSNAP: return "lssnap";

	case CEPH_MDS_OP_MKSNAP: return "mksnap";

	case CEPH_MDS_OP_RMSNAP: return "rmsnap";

	case CEPH_MDS_OP_RENAMESNAP: return "renamesnap";

	case CEPH_MDS_OP_SETFILELOCK: return "setfilelock";

	case CEPH_MDS_OP_GETFILELOCK: return "getfilelock";

	}

include/linux/ceph/ceph_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ enum { 
	CEPH_MDS_OP_MKSNAP     = 0x01400,

	CEPH_MDS_OP_RMSNAP     = 0x01401,

	CEPH_MDS_OP_LSSNAP     = 0x00402,

	CEPH_MDS_OP_RENAMESNAP = 0x01403,

};



extern const char *ceph_mds_op_name(int op);