[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1419199680-13390-1-git-send-email-rickard_strandqvist@spectrumdigital.se>
Date: Sun, 21 Dec 2014 23:08:00 +0100
From: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se>
To: Oleg Drokin <oleg.drokin@...el.com>,
Andreas Dilger <andreas.dilger@...el.com>
Cc: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Lai Siyao <laisiyao@...mcloud.com>,
Peng Tao <bergwolf@...il.com>,
Julia Lawall <Julia.Lawall@...6.fr>,
Greg Donald <gdonald@...il.com>,
Al Viro <viro@...iv.linux.org.uk>,
"John L. Hammond" <john.hammond@...el.com>,
Brian Behlendorf <behlendorf1@...l.gov>,
HPDD-discuss@...ts.01.org, devel@...verdev.osuosl.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] staging: lustre: lustre: llite: llite_lib.c: Removes unnecessary NULL check
Removes same unnecessary NULL check.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se>
---
drivers/staging/lustre/lustre/llite/llite_lib.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index 7b6b9e2..435e1ad 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -591,10 +591,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
get_uuid2fsid(uuid->uuid, strlen(uuid->uuid), &sbi->ll_fsid);
}
- if (data != NULL)
- OBD_FREE_PTR(data);
- if (osfs != NULL)
- OBD_FREE_PTR(osfs);
+ OBD_FREE_PTR(data);
+ OBD_FREE_PTR(osfs);
return err;
out_root:
@@ -612,10 +610,8 @@ out_md:
obd_disconnect(sbi->ll_md_exp);
sbi->ll_md_exp = NULL;
out:
- if (data != NULL)
- OBD_FREE_PTR(data);
- if (osfs != NULL)
- OBD_FREE_PTR(osfs);
+ OBD_FREE_PTR(data);
+ OBD_FREE_PTR(osfs);
lprocfs_unregister_mountpoint(sbi);
return err;
}
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists