leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ceph: fix fallocate division

Browse Source 
We need to use do_div to divide by a 64-bit value.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Sage Weil 2013-08-27 12:15:16 -07:00
parent ad7a60de88
commit b314a90d8f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/ceph/file.c
View File

@ -960,13 +960,17 @@ static int ceph_zero_objects(struct inode *inode, loff_t offset, loff_t length)
{
int ret = 0;
struct ceph_inode_info *ci = ceph_inode(inode);
__s32 stripe_unit = ceph_file_layout_su(ci->i_layout);
__s32 stripe_count = ceph_file_layout_stripe_count(ci->i_layout);
__s32 object_size = ceph_file_layout_object_size(ci->i_layout);
loff_t object_set_size = (loff_t)object_size * stripe_count;
s32 stripe_unit = ceph_file_layout_su(ci->i_layout);
s32 stripe_count = ceph_file_layout_stripe_count(ci->i_layout);
s32 object_size = ceph_file_layout_object_size(ci->i_layout);
u64 object_set_size = object_size * stripe_count;
u64 nearly, t;
/* round offset up to next period boundary */
nearly = offset + object_set_size - 1;
t = nearly;
nearly -= do_div(t, object_set_size);
loff_t nearly = (offset + object_set_size - 1)
/ object_set_size * object_set_size;
while (length && offset < nearly) {
loff_t size = length;
ret = ceph_zero_partial_object(inode, offset, &size);