From d686e576471057151ee22bc5cbc83e351d7389b1 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Tue, 11 Feb 2014 08:51:13 -0800 Subject: [PATCH 1/1] LU-4612 lvfs: correct call to pop_ctxt Earlier commit 3e7573cc14a331f01150814495e2345793e22f06 that converted a call of osd_pop_ctxt() to pop_ctxt() ignored the fact the argument order of these routines were different. This led to panics. This patch fixes the pop_ctxt() call by putting the arguments in the correct order. Signed-off-by: Bob Glossman Change-Id: I352250fe3ed91cb8a23a5b8e88b944dc8309b481 Reviewed-on: http://review.whamcloud.com/9224 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: John L. Hammond Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- lustre/osd-ldiskfs/osd_compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre/osd-ldiskfs/osd_compat.c b/lustre/osd-ldiskfs/osd_compat.c index b4a018c..6ec1129 100644 --- a/lustre/osd-ldiskfs/osd_compat.c +++ b/lustre/osd-ldiskfs/osd_compat.c @@ -411,7 +411,7 @@ static int osd_ost_init(const struct lu_env *env, struct osd_device *dev) GOTO(cleanup, rc); cleanup: - pop_ctxt(&new, &save); + pop_ctxt(&save, &new); if (IS_ERR(d)) { OBD_FREE_PTR(dev->od_ost_map); RETURN(PTR_ERR(d)); -- 1.8.3.1