2 files changed, 4 insertions, 8 deletions

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 0a3c05d10167..818b37be5153 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -22,10 +22,8 @@
 
 static void ino_lnkfree(struct autofs_info *ino)
 {
-        if (ino->u.symlink) {
-                kfree(ino->u.symlink);
-                ino->u.symlink = NULL;
-        }
+        kfree(ino->u.symlink);
+        ino->u.symlink = NULL;
 }
 
 struct autofs_info *autofs4_init_ino(struct autofs_info *ino,
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 3df86285a1c7..394ff36ef8f1 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -243,10 +243,8 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
         if ( sbi->catatonic ) {
                 /* We might have slept, so check again for catatonic mode */
                 wq->status = -ENOENT;
-                if ( wq->name ) {
-                        kfree(wq->name);
-                        wq->name = NULL;
-                }
+                kfree(wq->name);
+                wq->name = NULL;
         }
 
         if ( wq->name ) {