aboutsummaryrefslogtreecommitdiffstats
path: root/fs/hpfs/inode.c
diff options
context:
space:
mode:
authorMikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>2011-05-08 14:43:06 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-09 12:04:23 -0400
commit7d23ce36e3f52f9b83ac8da49296b73339c8b5b8 (patch)
tree0c3973efa632e3c58d056c5d949a38b4c475193f /fs/hpfs/inode.c
parent7dd29d8d865efdb00c0542a5d2c87af8c52ea6c7 (diff)
HPFS: Remove remaining locks
Remove remaining locks Because of a new global per-fs lock, no other locks are needed Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hpfs/inode.c')
-rw-r--r--fs/hpfs/inode.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c
index 87f1f787e767..29cf0508d271 100644
--- a/fs/hpfs/inode.c
+++ b/fs/hpfs/inode.c
@@ -187,9 +187,7 @@ void hpfs_write_inode(struct inode *i)
187 kfree(hpfs_inode->i_rddir_off); 187 kfree(hpfs_inode->i_rddir_off);
188 hpfs_inode->i_rddir_off = NULL; 188 hpfs_inode->i_rddir_off = NULL;
189 } 189 }
190 mutex_lock(&hpfs_inode->i_parent_mutex);
191 if (!i->i_nlink) { 190 if (!i->i_nlink) {
192 mutex_unlock(&hpfs_inode->i_parent_mutex);
193 return; 191 return;
194 } 192 }
195 parent = iget_locked(i->i_sb, hpfs_inode->i_parent_dir); 193 parent = iget_locked(i->i_sb, hpfs_inode->i_parent_dir);
@@ -200,14 +198,11 @@ void hpfs_write_inode(struct inode *i)
200 hpfs_read_inode(parent); 198 hpfs_read_inode(parent);
201 unlock_new_inode(parent); 199 unlock_new_inode(parent);
202 } 200 }
203 mutex_lock(&hpfs_inode->i_mutex);
204 hpfs_write_inode_nolock(i); 201 hpfs_write_inode_nolock(i);
205 mutex_unlock(&hpfs_inode->i_mutex);
206 iput(parent); 202 iput(parent);
207 } else { 203 } else {
208 mark_inode_dirty(i); 204 mark_inode_dirty(i);
209 } 205 }
210 mutex_unlock(&hpfs_inode->i_parent_mutex);
211} 206}
212 207
213void hpfs_write_inode_nolock(struct inode *i) 208void hpfs_write_inode_nolock(struct inode *i)