projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
[cascardo/linux.git]
/
fs
/
nilfs2
/
inode.c
diff --git
a/fs/nilfs2/inode.c
b/fs/nilfs2/inode.c
index
5040220
..
2a0a5a3
100644
(file)
--- a/
fs/nilfs2/inode.c
+++ b/
fs/nilfs2/inode.c
@@
-664,7
+664,6
@@
int nilfs_load_inode_block(struct nilfs_sb_info *sbi, struct inode *inode,
int err;
spin_lock(&sbi->s_inode_lock);
- /* Caller of this function MUST lock s_inode_lock */
if (ii->i_bh == NULL) {
spin_unlock(&sbi->s_inode_lock);
err = nilfs_ifile_get_inode_block(sbi->s_ifile, inode->i_ino,