* [PATCH] ceph: Add check returned value on func ceph_calc_ceph_pg.
@ 2013-08-02 10:14 majianpeng
2013-08-02 20:12 ` Sage Weil
0 siblings, 1 reply; 2+ messages in thread
From: majianpeng @ 2013-08-02 10:14 UTC (permalink / raw)
To: sage; +Cc: ceph-devel
Func ceph_calc_ceph_pg maybe failed.So add check for returned value.
Signed-off-by: Jianpeng Ma <majianpeng@gmail.com>
---
fs/ceph/ioctl.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
index e0b4ef3..8c463dd 100644
--- a/fs/ceph/ioctl.c
+++ b/fs/ceph/ioctl.c
@@ -209,8 +209,12 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)
snprintf(dl.object_name, sizeof(dl.object_name), "%llx.%08llx",
ceph_ino(inode), dl.object_no);
- ceph_calc_ceph_pg(&pgid, dl.object_name, osdc->osdmap,
- ceph_file_layout_pg_pool(ci->i_layout));
+ r = ceph_calc_ceph_pg(&pgid, dl.object_name, osdc->osdmap,
+ ceph_file_layout_pg_pool(ci->i_layout));
+ if (r < 0) {
+ up_read(&osdc->map_sem);
+ return r;
+ }
dl.osd = ceph_calc_pg_primary(osdc->osdmap, pgid);
if (dl.osd >= 0) {
--
1.8.1.2
Thanks!
Jianpeng Ma
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] ceph: Add check returned value on func ceph_calc_ceph_pg.
2013-08-02 10:14 [PATCH] ceph: Add check returned value on func ceph_calc_ceph_pg majianpeng
@ 2013-08-02 20:12 ` Sage Weil
0 siblings, 0 replies; 2+ messages in thread
From: Sage Weil @ 2013-08-02 20:12 UTC (permalink / raw)
To: majianpeng; +Cc: ceph-devel
Applied, thanks!
On Fri, 2 Aug 2013, majianpeng wrote:
> Func ceph_calc_ceph_pg maybe failed.So add check for returned value.
>
> Signed-off-by: Jianpeng Ma <majianpeng@gmail.com>
> ---
> fs/ceph/ioctl.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
> index e0b4ef3..8c463dd 100644
> --- a/fs/ceph/ioctl.c
> +++ b/fs/ceph/ioctl.c
> @@ -209,8 +209,12 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)
> snprintf(dl.object_name, sizeof(dl.object_name), "%llx.%08llx",
> ceph_ino(inode), dl.object_no);
>
> - ceph_calc_ceph_pg(&pgid, dl.object_name, osdc->osdmap,
> - ceph_file_layout_pg_pool(ci->i_layout));
> + r = ceph_calc_ceph_pg(&pgid, dl.object_name, osdc->osdmap,
> + ceph_file_layout_pg_pool(ci->i_layout));
> + if (r < 0) {
> + up_read(&osdc->map_sem);
> + return r;
> + }
>
> dl.osd = ceph_calc_pg_primary(osdc->osdmap, pgid);
> if (dl.osd >= 0) {
> --
> 1.8.1.2
>
>
> Thanks!
> Jianpeng Ma
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-02 20:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-02 10:14 [PATCH] ceph: Add check returned value on func ceph_calc_ceph_pg majianpeng
2013-08-02 20:12 ` Sage Weil
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.