[PATCH 1/2] cifs: Include linux/err.h for IS_ERR and PTR_ERR

[PATCH 1/2] cifs: Include linux/err.h for IS_ERR and PTR_ERR

[David Howells]

From: Stephen Rothwell <sfr@canb.auug.org.au>

Fixes build errors:

net/dns_resolver/dns_key.c: In function 'init_dns_resolver':
net/dns_resolver/dns_key.c:170: error: implicit declaration of function 'IS_ERR'
net/dns_resolver/dns_key.c:171: error: implicit declaration of function 'PTR_ERR'
net/dns_resolver/dns_query.c: In function 'dns_query':
net/dns_resolver/dns_query.c:126: error: implicit declaration of function 'IS_ERR'
net/dns_resolver/dns_query.c:127: error: implicit declaration of function 'PTR_ERR'

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David Howells <dhowells@redhat.com>
---

 net/dns_resolver/dns_key.c   |    1 +
 net/dns_resolver/dns_query.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c
index 1b1b411..400a04d 100644
--- a/net/dns_resolver/dns_key.c
+++ b/net/dns_resolver/dns_key.c
@@ -28,6 +28,7 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/keyctl.h>
+#include <linux/err.h>
 #include <keys/dns_resolver-type.h>
 #include <keys/user-type.h>
 #include "internal.h"
diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
index 6c0cf31..b33e1f7 100644
--- a/net/dns_resolver/dns_query.c
+++ b/net/dns_resolver/dns_query.c
@@ -39,6 +39,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/dns_resolver.h>
+#include <linux/err.h>
 #include <keys/dns_resolver-type.h>
 #include <keys/user-type.h>
 

[PATCH 2/2] DNS: Fixes for the DNS query module

[David Howells]

Fixes for the DNS query module, including:

 (1) Use 'negative' instead of '-ve' in the documentation.

 (2) Mark the kdoc comment with '/**' on dns_query().

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David Howells <dhowells@redhat.com>
---

 Documentation/networking/dns_resolver.txt |    6 +++---
 net/dns_resolver/dns_query.c              |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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

Re: [PATCH 2/2] DNS: Fixes for the DNS query module

[Randy Dunlap]

On Fri, 06 Aug 2010 03:13:52 +0100 David Howells wrote:

> Fixes for the DNS query module, including:
> 
>  (1) Use 'negative' instead of '-ve' in the documentation.
> 
>  (2) Mark the kdoc comment with '/**' on dns_query().
> 
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: David Howells <dhowells@redhat.com>

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

Thanks, David.


> ---
> 
>  Documentation/networking/dns_resolver.txt |    6 +++---
>  net/dns_resolver/dns_query.c              |    2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> 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
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***