| Message ID | 201307161936127882610@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Applied, thanks! sage On Tue, 16 Jul 2013, majianpeng wrote: > Signed-off-by: Jianpeng Ma <majianpeng@gmail.com> > --- > fs/ceph/ioctl.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c > index e0b4ef3..a5ce62e 100644 > --- a/fs/ceph/ioctl.c > +++ b/fs/ceph/ioctl.c > @@ -196,8 +196,10 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg) > r = ceph_calc_file_object_mapping(&ci->i_layout, dl.file_offset, len, > &dl.object_no, &dl.object_offset, > &olen); > - if (r < 0) > + if (r < 0) { > + up_read(&osdc->map_sem); > return -EIO; > + } > dl.file_offset -= dl.object_offset; > dl.object_size = ceph_file_layout_object_size(ci->i_layout); > dl.block_size = ceph_file_layout_su(ci->i_layout); > -- > 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c index e0b4ef3..a5ce62e 100644 --- a/fs/ceph/ioctl.c +++ b/fs/ceph/ioctl.c @@ -196,8 +196,10 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg) r = ceph_calc_file_object_mapping(&ci->i_layout, dl.file_offset, len, &dl.object_no, &dl.object_offset, &olen); - if (r < 0) + if (r < 0) { + up_read(&osdc->map_sem); return -EIO; + } dl.file_offset -= dl.object_offset; dl.object_size = ceph_file_layout_object_size(ci->i_layout); dl.block_size = ceph_file_layout_su(ci->i_layout);
Signed-off-by: Jianpeng Ma <majianpeng@gmail.com> --- fs/ceph/ioctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 1.8.1.2