Commit 7cb99947 authored by Hu Weiwen's avatar Hu Weiwen Committed by Ilya Dryomov
Browse files

ceph: don't truncate file in atomic_open 



Clear O_TRUNC from the flags sent in the MDS create request.

`atomic_open' is called before permission check. We should not do any
modification to the file here. The caller will do the truncation
afterward.

Fixes: 124e68e7 ("ceph: file operations")
Signed-off-by: default avatarHu Weiwen <sehuww@mail.scut.edu.cn>
Reviewed-by: default avatarXiubo Li <xiubli@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 0c04a117

fs/ceph/file.c

+6 −3
Original line number Diff line number Diff line
@@ -749,6 +749,11 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, 
	err = ceph_wait_on_conflict_unlink(dentry);

	if (err)

		return err;

	/*

	 * Do not truncate the file, since atomic_open is called before the

	 * permission check. The caller will do the truncation afterward.

	 */

	flags &= ~O_TRUNC;



	if (flags & O_CREAT) {

		if (ceph_quota_is_max_files_exceeded(dir))
@@ -824,9 +829,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, 
	}



	set_bit(CEPH_MDS_R_PARENT_LOCKED, &req->r_req_flags);

	err = ceph_mdsc_do_request(mdsc,

				   (flags & (O_CREAT|O_TRUNC)) ? dir : NULL,

				   req);

	err = ceph_mdsc_do_request(mdsc, (flags & O_CREAT) ? dir : NULL, req);

	if (err == -ENOENT) {

		dentry = ceph_handle_snapdir(req, dentry);

		if (IS_ERR(dentry)) {