diff options
author | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:49:38 -0500 |
---|---|---|
committer | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:50:23 -0500 |
commit | b5c84bf6f6fa3a7dfdcb556023a62953574b60ee (patch) | |
tree | 7a2c299a180713e21d5cb653cb933121adf53c31 /fs/configfs | |
parent | 949854d02455080d20cd3e1db28a3a18daf7599d (diff) |
fs: dcache remove dcache_lock
dcache_lock no longer protects anything. remove it.
Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'fs/configfs')
-rw-r--r-- | fs/configfs/configfs_internal.h | 2 | ||||
-rw-r--r-- | fs/configfs/inode.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/fs/configfs/configfs_internal.h b/fs/configfs/configfs_internal.h index e58b4c30e216..026cf68553a4 100644 --- a/fs/configfs/configfs_internal.h +++ b/fs/configfs/configfs_internal.h | |||
@@ -120,7 +120,6 @@ static inline struct config_item *configfs_get_config_item(struct dentry *dentry | |||
120 | { | 120 | { |
121 | struct config_item * item = NULL; | 121 | struct config_item * item = NULL; |
122 | 122 | ||
123 | spin_lock(&dcache_lock); | ||
124 | spin_lock(&dentry->d_lock); | 123 | spin_lock(&dentry->d_lock); |
125 | if (!d_unhashed(dentry)) { | 124 | if (!d_unhashed(dentry)) { |
126 | struct configfs_dirent * sd = dentry->d_fsdata; | 125 | struct configfs_dirent * sd = dentry->d_fsdata; |
@@ -131,7 +130,6 @@ static inline struct config_item *configfs_get_config_item(struct dentry *dentry | |||
131 | item = config_item_get(sd->s_element); | 130 | item = config_item_get(sd->s_element); |
132 | } | 131 | } |
133 | spin_unlock(&dentry->d_lock); | 132 | spin_unlock(&dentry->d_lock); |
134 | spin_unlock(&dcache_lock); | ||
135 | 133 | ||
136 | return item; | 134 | return item; |
137 | } | 135 | } |
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c index 79b37765d8ff..fb3a55fff82a 100644 --- a/fs/configfs/inode.c +++ b/fs/configfs/inode.c | |||
@@ -250,18 +250,14 @@ void configfs_drop_dentry(struct configfs_dirent * sd, struct dentry * parent) | |||
250 | struct dentry * dentry = sd->s_dentry; | 250 | struct dentry * dentry = sd->s_dentry; |
251 | 251 | ||
252 | if (dentry) { | 252 | if (dentry) { |
253 | spin_lock(&dcache_lock); | ||
254 | spin_lock(&dentry->d_lock); | 253 | spin_lock(&dentry->d_lock); |
255 | if (!(d_unhashed(dentry) && dentry->d_inode)) { | 254 | if (!(d_unhashed(dentry) && dentry->d_inode)) { |
256 | dget_locked_dlock(dentry); | 255 | dget_locked_dlock(dentry); |
257 | __d_drop(dentry); | 256 | __d_drop(dentry); |
258 | spin_unlock(&dentry->d_lock); | 257 | spin_unlock(&dentry->d_lock); |
259 | spin_unlock(&dcache_lock); | ||
260 | simple_unlink(parent->d_inode, dentry); | 258 | simple_unlink(parent->d_inode, dentry); |
261 | } else { | 259 | } else |
262 | spin_unlock(&dentry->d_lock); | 260 | spin_unlock(&dentry->d_lock); |
263 | spin_unlock(&dcache_lock); | ||
264 | } | ||
265 | } | 261 | } |
266 | } | 262 | } |
267 | 263 | ||