Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[deliverable/linux.git] / net / dns_resolver / dns_query.c

diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
index 39d2c39bdf872713e890792914597f29a4ef53ae..4677b6fa6dda2c71ace9d97536a450684d18d3ef 100644 (file)
--- a/net/dns_resolver/dns_query.c
+++ b/net/dns_resolver/dns_query.c
@@ -70,7 +70,7 @@ int dns_query(const char *type, const char *name, size_t namelen,
              const char *options, char **_result, time_t *_expiry)
 {
        struct key *rkey;
-       struct user_key_payload *upayload;
+       const struct user_key_payload *upayload;
        const struct cred *saved_cred;
        size_t typelen, desclen;
        char *desc, *cp;
@@ -137,12 +137,11 @@ int dns_query(const char *type, const char *name, size_t namelen,
                goto put;
 
        /* If the DNS server gave an error, return that to the caller */
-       ret = rkey->type_data.x[0];
+       ret = PTR_ERR(rkey->payload.data[dns_key_error]);
        if (ret)
                goto put;
 
-       upayload = rcu_dereference_protected(rkey->payload.data,
-                                            lockdep_is_held(&rkey->sem));
+       upayload = user_key_payload(rkey);
        len = upayload->datalen;
 
        ret = -ENOMEM;