iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ceph: define ceph_writepages_osd_request()

Browse Source 
Mostly for readability, define ceph_writepages_osd_request() and
use it to allocate the osd request for ceph_writepages_start().

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2013-03-14 14:09:05 -05:00 committed by Sage Weil
parent acead002b2
commit 94fe8420bf
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fs/ceph/addr.c
View File

@ -654,6 +654,26 @@ static void alloc_page_vec(struct ceph_fs_client *fsc,
} }
} }
static struct ceph_osd_request *
ceph_writepages_osd_request(struct inode *inode, u64 offset, u64 *len,
struct ceph_snap_context *snapc,
int num_ops, struct ceph_osd_req_op *ops)
{
struct ceph_fs_client *fsc;
struct ceph_inode_info *ci;
struct ceph_vino vino;
fsc = ceph_inode_to_client(inode);
ci = ceph_inode(inode);
vino = ceph_vino(inode);
/* BUG_ON(vino.snap != CEPH_NOSNAP); */
return ceph_osdc_new_request(&fsc->client->osdc, &ci->i_layout,
vino, offset, len, num_ops, ops, CEPH_OSD_OP_WRITE,
CEPH_OSD_FLAG_WRITE|CEPH_OSD_FLAG_ONDISK,
snapc, ci->i_truncate_seq, ci->i_truncate_size, true);
}
/* /*
* initiate async writeback * initiate async writeback
*/ */
@ -835,16 +855,9 @@ get_more_pages:
/* prepare async write request */ /* prepare async write request */
offset = (u64) page_offset(page); offset = (u64) page_offset(page);
len = wsize; len = wsize;
vino = ceph_vino(inode); req = ceph_writepages_osd_request(inode,
/* BUG_ON(vino.snap != CEPH_NOSNAP); */ offset, &len, snapc,
req = ceph_osdc_new_request(&fsc->client->osdc, num_ops, ops);
&ci->i_layout, vino, offset, &len,
num_ops, ops,
CEPH_OSD_OP_WRITE,
CEPH_OSD_FLAG_WRITE |
CEPH_OSD_FLAG_ONDISK,
snapc, ci->i_truncate_seq,
ci->i_truncate_size, true);
if (IS_ERR(req)) { if (IS_ERR(req)) {
rc = PTR_ERR(req); rc = PTR_ERR(req);
@ -852,6 +865,7 @@ get_more_pages:
break; break;
} }
vino = ceph_vino(inode);
ceph_osdc_build_request(req, offset, ceph_osdc_build_request(req, offset,
num_ops, ops, snapc, vino.snap, num_ops, ops, snapc, vino.snap,
&inode->i_mtime); &inode->i_mtime);