|
@@ -1609,7 +1609,7 @@ int ceph_uninline_data(struct file *filp, struct page *locked_page)
|
|
ceph_vino(inode), 0, &len, 0, 1,
|
|
ceph_vino(inode), 0, &len, 0, 1,
|
|
CEPH_OSD_OP_CREATE,
|
|
CEPH_OSD_OP_CREATE,
|
|
CEPH_OSD_FLAG_ONDISK | CEPH_OSD_FLAG_WRITE,
|
|
CEPH_OSD_FLAG_ONDISK | CEPH_OSD_FLAG_WRITE,
|
|
- ceph_empty_snapc, 0, 0, false);
|
|
|
|
|
|
+ NULL, 0, 0, false);
|
|
if (IS_ERR(req)) {
|
|
if (IS_ERR(req)) {
|
|
err = PTR_ERR(req);
|
|
err = PTR_ERR(req);
|
|
goto out;
|
|
goto out;
|
|
@@ -1627,9 +1627,8 @@ int ceph_uninline_data(struct file *filp, struct page *locked_page)
|
|
ceph_vino(inode), 0, &len, 1, 3,
|
|
ceph_vino(inode), 0, &len, 1, 3,
|
|
CEPH_OSD_OP_WRITE,
|
|
CEPH_OSD_OP_WRITE,
|
|
CEPH_OSD_FLAG_ONDISK | CEPH_OSD_FLAG_WRITE,
|
|
CEPH_OSD_FLAG_ONDISK | CEPH_OSD_FLAG_WRITE,
|
|
- ceph_empty_snapc,
|
|
|
|
- ci->i_truncate_seq, ci->i_truncate_size,
|
|
|
|
- false);
|
|
|
|
|
|
+ NULL, ci->i_truncate_seq,
|
|
|
|
+ ci->i_truncate_size, false);
|
|
if (IS_ERR(req)) {
|
|
if (IS_ERR(req)) {
|
|
err = PTR_ERR(req);
|
|
err = PTR_ERR(req);
|
|
goto out;
|
|
goto out;
|
|
@@ -1750,8 +1749,7 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci, u32 pool)
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
- rd_req = ceph_osdc_alloc_request(&fsc->client->osdc,
|
|
|
|
- ceph_empty_snapc,
|
|
|
|
|
|
+ rd_req = ceph_osdc_alloc_request(&fsc->client->osdc, NULL,
|
|
1, false, GFP_NOFS);
|
|
1, false, GFP_NOFS);
|
|
if (!rd_req) {
|
|
if (!rd_req) {
|
|
err = -ENOMEM;
|
|
err = -ENOMEM;
|
|
@@ -1765,8 +1763,7 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci, u32 pool)
|
|
"%llx.00000000", ci->i_vino.ino);
|
|
"%llx.00000000", ci->i_vino.ino);
|
|
rd_req->r_base_oid.name_len = strlen(rd_req->r_base_oid.name);
|
|
rd_req->r_base_oid.name_len = strlen(rd_req->r_base_oid.name);
|
|
|
|
|
|
- wr_req = ceph_osdc_alloc_request(&fsc->client->osdc,
|
|
|
|
- ceph_empty_snapc,
|
|
|
|
|
|
+ wr_req = ceph_osdc_alloc_request(&fsc->client->osdc, NULL,
|
|
1, false, GFP_NOFS);
|
|
1, false, GFP_NOFS);
|
|
if (!wr_req) {
|
|
if (!wr_req) {
|
|
err = -ENOMEM;
|
|
err = -ENOMEM;
|