From patchwork Fri Aug 6 02:13:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 117649 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o762EYhk031678 for ; Fri, 6 Aug 2010 02:14:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935169Ab0HFCOA (ORCPT ); Thu, 5 Aug 2010 22:14:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17641 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760760Ab0HFCN6 (ORCPT ); Thu, 5 Aug 2010 22:13:58 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o762DtwH018245 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 5 Aug 2010 22:13:55 -0400 Received: from warthog.cambridge.redhat.com (kibblesnbits.boston.devel.redhat.com [10.16.60.12]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o762DqdP000562 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 5 Aug 2010 22:13:55 -0400 Received: from [127.0.0.1] (helo=warthog.procyon.org.uk) by warthog.cambridge.redhat.com with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OhCRU-0007mh-GY; Fri, 06 Aug 2010 03:13:52 +0100 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells Subject: [PATCH 2/2] DNS: Fixes for the DNS query module To: smfrench@gmail.com Cc: jlayton@redhat.com, linux-fsdevel@vger.kernel.org, linux-cifs@vger.kernel.org, linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org, David Howells Date: Fri, 06 Aug 2010 03:13:52 +0100 Message-ID: <20100806021352.29873.16452.stgit@warthog.procyon.org.uk> In-Reply-To: <20100806021347.29873.87087.stgit@warthog.procyon.org.uk> References: <20100806021347.29873.87087.stgit@warthog.procyon.org.uk> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 06 Aug 2010 02:14:34 +0000 (UTC) diff --git a/Documentation/networking/dns_resolver.txt b/Documentation/networking/dns_resolver.txt index d8e0ce1..aefd1e6 100644 --- a/Documentation/networking/dns_resolver.txt +++ b/Documentation/networking/dns_resolver.txt @@ -96,9 +96,9 @@ implemented in the module can be called after doing: for the default query type it is just a list of comma-separated IPv4 and IPv6 addresses. The caller must free the result. - The length of the result string is returned on success, and a -ve error - code is returned otherwise. -EKEYREJECTED will be returned if the DNS - lookup failed. + The length of the result string is returned on success, and a negative + error code is returned otherwise. -EKEYREJECTED will be returned if the + DNS lookup failed. If _expiry is non-NULL, the expiry time (TTL) of the result will be returned also. diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c index b33e1f7..03d5255 100644 --- a/net/dns_resolver/dns_query.c +++ b/net/dns_resolver/dns_query.c @@ -45,7 +45,7 @@ #include "internal.h" -/* +/** * dns_query - Query the DNS * @type: Query type (or NULL for straight host->IP lookup) * @name: Name to look up