LU-1534 osd: Fix LBUGs when destroying IGIF objects

[fs/lustre-release.git] / lustre / llite / llite_nfs.c

diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c
index 99a9943..a0d581b 100644 (file)
--- a/lustre/llite/llite_nfs.c
+++ b/lustre/llite/llite_nfs.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -334,8 +334,8 @@ static struct dentry *ll_get_parent(struct dentry *dchild)
         op_data = ll_prep_md_op_data(NULL, dir, NULL, dotdot,
                                      strlen(dotdot), 0,
                                      LUSTRE_OPC_ANY, NULL);
-        if (op_data == NULL)
-                RETURN(ERR_PTR(-ENOMEM));
+        if (IS_ERR(op_data))
+                RETURN((void *)op_data);
 
         rc = md_getattr_name(sbi->ll_md_exp, op_data, &req);
         ll_finish_md_op_data(op_data);