From fad90288958bd4693ec9574a1bbb77ee73988912 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Thu, 14 Jun 2007 03:45:18 +0900
Subject: [PATCH] --- yaml --- r: 59138 b: refs/heads/master c:
 9d9307dabb3de8140fb3801bf6eb01f231dbd83d h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/sysfs/inode.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5153464d2bcd..502c6147d352 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c73f18b7d95de8a007039337063a770b5fc8e7a
+refs/heads/master: 9d9307dabb3de8140fb3801bf6eb01f231dbd83d
diff --git a/trunk/fs/sysfs/inode.c b/trunk/fs/sysfs/inode.c
index 732fd7f371e0..ee31bf369a88 100644
--- a/trunk/fs/sysfs/inode.c
+++ b/trunk/fs/sysfs/inode.c
@@ -285,7 +285,7 @@ void sysfs_drop_dentry(struct sysfs_dirent *sd)
 int sysfs_hash_and_remove(struct dentry * dir, const char * name)
 {
 	struct sysfs_dirent **pos, *sd;
-	struct sysfs_dirent *parent_sd = dir->d_fsdata;
+	struct sysfs_dirent *parent_sd;
 	int found = 0;
 
 	if (!dir)
@@ -295,6 +295,7 @@ int sysfs_hash_and_remove(struct dentry * dir, const char * name)
 		/* no inode means this hasn't been made visible yet */
 		return -ENOENT;
 
+	parent_sd = dir->d_fsdata;
 	mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
 	for (pos = &parent_sd->s_children; *pos; pos = &(*pos)->s_sibling) {
 		sd = *pos;