mirror of
https://github.com/torvalds/linux.git
synced 2026-06-07 22:14:04 +02:00
ceph: don't truncate file in atomic_open
commit7cb9994754upstream. 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:124e68e740("ceph: file operations") Signed-off-by: Hu Weiwen <sehuww@mail.scut.edu.cn> Reviewed-by: Xiubo Li <xiubli@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com> [Xiubo: fixed a trivial conflict for 5.10 backport] Signed-off-by: Xiubo Li <xiubli@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
8a18fdc5ae
commit
b23b0cd57e
|
|
@ -703,6 +703,12 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
|
||||||
if (dentry->d_name.len > NAME_MAX)
|
if (dentry->d_name.len > NAME_MAX)
|
||||||
return -ENAMETOOLONG;
|
return -ENAMETOOLONG;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 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 (flags & O_CREAT) {
|
||||||
if (ceph_quota_is_max_files_exceeded(dir))
|
if (ceph_quota_is_max_files_exceeded(dir))
|
||||||
return -EDQUOT;
|
return -EDQUOT;
|
||||||
|
|
@ -769,9 +775,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
|
||||||
}
|
}
|
||||||
|
|
||||||
set_bit(CEPH_MDS_R_PARENT_LOCKED, &req->r_req_flags);
|
set_bit(CEPH_MDS_R_PARENT_LOCKED, &req->r_req_flags);
|
||||||
err = ceph_mdsc_do_request(mdsc,
|
err = ceph_mdsc_do_request(mdsc, (flags & O_CREAT) ? dir : NULL, req);
|
||||||
(flags & (O_CREAT|O_TRUNC)) ? dir : NULL,
|
|
||||||
req);
|
|
||||||
err = ceph_handle_snapdir(req, dentry, err);
|
err = ceph_handle_snapdir(req, dentry, err);
|
||||||
if (err)
|
if (err)
|
||||||
goto out_req;
|
goto out_req;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user