git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
fs
/
nilfs2
/
namei.c
diff --git
a/fs/nilfs2/namei.c
b/fs/nilfs2/namei.c
index
a314199
..
768982d
100644
(file)
--- a/
fs/nilfs2/namei.c
+++ b/
fs/nilfs2/namei.c
@@
-289,7
+289,7
@@
static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry)
nilfs_warning(inode->i_sb, __func__,
"deleting nonexistent file (%lu), %d\n",
inode->i_ino, inode->i_nlink);
-
inode->i_nlink = 1
;
+
set_nlink(inode, 1)
;
}
err = nilfs_delete_entry(de, page);
if (err)