Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-microblaze.git] / fs / ceph / export.c

diff --git a/fs/ceph/export.c b/fs/ceph/export.c
index d3ef7ee..15ff1b0 100644 (file)
--- a/fs/ceph/export.c
+++ b/fs/ceph/export.c
@@ -368,7 +368,7 @@ static struct dentry *ceph_get_parent(struct dentry *child)
        }
 out:
        dout("get_parent %p ino %llx.%llx err=%ld\n",
-            child, ceph_vinop(inode), (IS_ERR(dn) ? PTR_ERR(dn) : 0));
+            child, ceph_vinop(inode), (long)PTR_ERR_OR_ZERO(dn));
        return dn;
 }