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

Commit 752c8bdc authored by Sage Weil's avatar Sage Weil Committed by Yan, Zheng
Browse files

ceph: do not chain inode updates to parent fsync 



The fsync(dirfd) only covers namespace operations, not inode updates.
We do not need to cover setattr variants or O_TRUNC.

Reported-by: default avatarAl Viro <viro@xeniv.linux.org.uk>
Signed-off-by: default avatarSage Weil <sage@inktank.com>
Reviewed-by: default avatarYan, Zheng <zheng.z.yan@intel.com>
parent 180061a5

fs/ceph/file.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ int ceph_open(struct inode *inode, struct file *file) 
	ihold(inode);



	req->r_num_caps = 1;

	if (flags & (O_CREAT|O_TRUNC))

	if (flags & O_CREAT)

		parent_inode = ceph_get_dentry_parent_inode(file->f_dentry);

	err = ceph_mdsc_do_request(mdsc, parent_inode, req);

	iput(parent_inode);

fs/ceph/inode.c

+1 −4
Original line number Diff line number Diff line
@@ -1627,7 +1627,6 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr) 
{

	struct inode *inode = dentry->d_inode;

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct inode *parent_inode;

	const unsigned int ia_valid = attr->ia_valid;

	struct ceph_mds_request *req;

	struct ceph_mds_client *mdsc = ceph_sb_to_client(dentry->d_sb)->mdsc;
@@ -1819,9 +1818,7 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr) 
		req->r_inode_drop = release;

		req->r_args.setattr.mask = cpu_to_le32(mask);

		req->r_num_caps = 1;

		parent_inode = ceph_get_dentry_parent_inode(dentry);

		err = ceph_mdsc_do_request(mdsc, parent_inode, req);

		iput(parent_inode);

		err = ceph_mdsc_do_request(mdsc, NULL, req);

	}

	dout("setattr %p result=%d (%s locally, %d remote)\n", inode, err,

	     ceph_cap_string(dirtied), mask);

fs/ceph/ioctl.c

+1 −4
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ static long __validate_layout(struct ceph_mds_client *mdsc, 
static long ceph_ioctl_set_layout(struct file *file, void __user *arg)

{

	struct inode *inode = file_inode(file);

	struct inode *parent_inode;

	struct ceph_mds_client *mdsc = ceph_sb_to_client(inode->i_sb)->mdsc;

	struct ceph_mds_request *req;

	struct ceph_ioctl_layout l;
@@ -121,9 +120,7 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg) 
		cpu_to_le32(l.object_size);

	req->r_args.setlayout.layout.fl_pg_pool = cpu_to_le32(l.data_pool);



	parent_inode = ceph_get_dentry_parent_inode(file->f_dentry);

	err = ceph_mdsc_do_request(mdsc, parent_inode, req);

	iput(parent_inode);

	err = ceph_mdsc_do_request(mdsc, NULL, req);

	ceph_mdsc_put_request(req);

	return err;

}

fs/ceph/xattr.c

+2 −8
Original line number Diff line number Diff line
@@ -842,7 +842,6 @@ static int ceph_sync_setxattr(struct dentry *dentry, const char *name, 
	struct ceph_fs_client *fsc = ceph_sb_to_client(dentry->d_sb);

	struct inode *inode = dentry->d_inode;

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct inode *parent_inode;

	struct ceph_mds_request *req;

	struct ceph_mds_client *mdsc = fsc->mdsc;

	int err;
@@ -893,9 +892,7 @@ static int ceph_sync_setxattr(struct dentry *dentry, const char *name, 
	req->r_data_len = size;



	dout("xattr.ver (before): %lld\n", ci->i_xattrs.version);

	parent_inode = ceph_get_dentry_parent_inode(dentry);

	err = ceph_mdsc_do_request(mdsc, parent_inode, req);

	iput(parent_inode);

	err = ceph_mdsc_do_request(mdsc, NULL, req);

	ceph_mdsc_put_request(req);

	dout("xattr.ver (after): %lld\n", ci->i_xattrs.version);
@@ -1019,7 +1016,6 @@ static int ceph_send_removexattr(struct dentry *dentry, const char *name) 
	struct ceph_fs_client *fsc = ceph_sb_to_client(dentry->d_sb);

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct inode *inode = dentry->d_inode;

	struct inode *parent_inode;

	struct ceph_mds_request *req;

	int err;
@@ -1033,9 +1029,7 @@ static int ceph_send_removexattr(struct dentry *dentry, const char *name) 
	req->r_num_caps = 1;

	req->r_path2 = kstrdup(name, GFP_NOFS);



	parent_inode = ceph_get_dentry_parent_inode(dentry);

	err = ceph_mdsc_do_request(mdsc, parent_inode, req);

	iput(parent_inode);

	err = ceph_mdsc_do_request(mdsc, NULL, req);

	ceph_mdsc_put_request(req);

	return err;

}