From f8d61c5b4d6a6e31048a061b80d4b13903f34bcd Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 26 Sep 2012 21:33:07 -0400 Subject: [PATCH] --- yaml --- r: 329018 b: refs/heads/master c: 3a8ca1b6bf7069338e266082479f2f632c29afb3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/hypfs/inode.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7aec7b325ee4..3c3b433c195d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fe0c0230a7c2d5f4061e681a3f3be9512446d23 +refs/heads/master: 3a8ca1b6bf7069338e266082479f2f632c29afb3 diff --git a/trunk/arch/s390/hypfs/inode.c b/trunk/arch/s390/hypfs/inode.c index 6767b437a103..a0d92d119f4b 100644 --- a/trunk/arch/s390/hypfs/inode.c +++ b/trunk/arch/s390/hypfs/inode.c @@ -72,8 +72,6 @@ static void hypfs_remove(struct dentry *dentry) struct dentry *parent; parent = dentry->d_parent; - if (!parent || !parent->d_inode) - return; mutex_lock(&parent->d_inode->i_mutex); if (hypfs_positive(dentry)) { if (S_ISDIR(dentry->d_inode->i_mode))