diff mbox

cifs: fix some unused variable warnings in id_rb_search

Message ID 1304510899-30360-1-git-send-email-jlayton@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jeff Layton May 4, 2011, 12:08 p.m. UTC
fs/cifs/cifsacl.c: In function ‘id_rb_search’:
fs/cifs/cifsacl.c:215:19: warning: variable ‘linkto’ set but not used
[-Wunused-but-set-variable]
fs/cifs/cifsacl.c:214:18: warning: variable ‘parent’ set but not used
[-Wunused-but-set-variable]

Cc: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 fs/cifs/cifsacl.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

Comments

Shirish Pargaonkar May 4, 2011, 6:02 p.m. UTC | #1
On Wed, May 4, 2011 at 7:08 AM, Jeff Layton <jlayton@redhat.com> wrote:
> fs/cifs/cifsacl.c: In function ‘id_rb_search’:
> fs/cifs/cifsacl.c:215:19: warning: variable ‘linkto’ set but not used
> [-Wunused-but-set-variable]
> fs/cifs/cifsacl.c:214:18: warning: variable ‘parent’ set but not used
> [-Wunused-but-set-variable]
>
> Cc: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
> Signed-off-by: Jeff Layton <jlayton@redhat.com>
> ---
>  fs/cifs/cifsacl.c |    5 -----
>  1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
> index a4aa0f0..bfb5ba5 100644
> --- a/fs/cifs/cifsacl.c
> +++ b/fs/cifs/cifsacl.c
> @@ -211,19 +211,14 @@ id_rb_search(struct rb_root *root, struct cifs_sid *sidptr)
>  {
>        int rc;
>        struct rb_node *node = root->rb_node;
> -       struct rb_node *parent = NULL;
> -       struct rb_node **linkto = &(root->rb_node);
>        struct cifs_sid_id *lsidid;
>
>        while (node) {
>                lsidid = rb_entry(node, struct cifs_sid_id, rbnode);
> -               parent = node;
>                rc = compare_sids(sidptr, &((lsidid)->sid));
>                if (rc > 0) {
> -                       linkto = &(node->rb_left);
>                        node = node->rb_left;
>                } else if (rc < 0) {
> -                       linkto = &(node->rb_right);
>                        node = node->rb_right;
>                } else /* node found */
>                        return lsidid;
> --
> 1.7.4.4
>
>

Looks correct.

Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Steve French May 4, 2011, 6:18 p.m. UTC | #2
merged.

On Wed, May 4, 2011 at 7:08 AM, Jeff Layton <jlayton@redhat.com> wrote:
> fs/cifs/cifsacl.c: In function ‘id_rb_search’:
> fs/cifs/cifsacl.c:215:19: warning: variable ‘linkto’ set but not used
> [-Wunused-but-set-variable]
> fs/cifs/cifsacl.c:214:18: warning: variable ‘parent’ set but not used
> [-Wunused-but-set-variable]
>
> Cc: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
> Signed-off-by: Jeff Layton <jlayton@redhat.com>
> ---
>  fs/cifs/cifsacl.c |    5 -----
>  1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
> index a4aa0f0..bfb5ba5 100644
> --- a/fs/cifs/cifsacl.c
> +++ b/fs/cifs/cifsacl.c
> @@ -211,19 +211,14 @@ id_rb_search(struct rb_root *root, struct cifs_sid *sidptr)
>  {
>        int rc;
>        struct rb_node *node = root->rb_node;
> -       struct rb_node *parent = NULL;
> -       struct rb_node **linkto = &(root->rb_node);
>        struct cifs_sid_id *lsidid;
>
>        while (node) {
>                lsidid = rb_entry(node, struct cifs_sid_id, rbnode);
> -               parent = node;
>                rc = compare_sids(sidptr, &((lsidid)->sid));
>                if (rc > 0) {
> -                       linkto = &(node->rb_left);
>                        node = node->rb_left;
>                } else if (rc < 0) {
> -                       linkto = &(node->rb_right);
>                        node = node->rb_right;
>                } else /* node found */
>                        return lsidid;
> --
> 1.7.4.4
>
>
diff mbox

Patch

diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index a4aa0f0..bfb5ba5 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -211,19 +211,14 @@  id_rb_search(struct rb_root *root, struct cifs_sid *sidptr)
 {
 	int rc;
 	struct rb_node *node = root->rb_node;
-	struct rb_node *parent = NULL;
-	struct rb_node **linkto = &(root->rb_node);
 	struct cifs_sid_id *lsidid;
 
 	while (node) {
 		lsidid = rb_entry(node, struct cifs_sid_id, rbnode);
-		parent = node;
 		rc = compare_sids(sidptr, &((lsidid)->sid));
 		if (rc > 0) {
-			linkto = &(node->rb_left);
 			node = node->rb_left;
 		} else if (rc < 0) {
-			linkto = &(node->rb_right);
 			node = node->rb_right;
 		} else /* node found */
 			return lsidid;