projects
/
linux-2.6-block.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.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-block.git]
/
fs
/
nilfs2
/
inode.c
diff --git
a/fs/nilfs2/inode.c
b/fs/nilfs2/inode.c
index be936df4ba73967837b83a50d4f465e47521924e..258d9fe2521a52f1a6d96d310d90bd0890434634 100644
(file)
--- a/
fs/nilfs2/inode.c
+++ b/
fs/nilfs2/inode.c
@@
-835,7
+835,7
@@
void nilfs_evict_inode(struct inode *inode)
int nilfs_setattr(struct dentry *dentry, struct iattr *iattr)
{
struct nilfs_transaction_info ti;
- struct inode *inode = d
entry->d_inode
;
+ struct inode *inode = d
_inode(dentry)
;
struct super_block *sb = inode->i_sb;
int err;