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 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
[pandora-kernel.git]
/
fs
/
anon_inodes.c
diff --git
a/fs/anon_inodes.c
b/fs/anon_inodes.c
index
57ce55b
..
5fd3811
100644
(file)
--- a/
fs/anon_inodes.c
+++ b/
fs/anon_inodes.c
@@
-102,7
+102,7
@@
struct file *anon_inode_getfile(const char *name,
this.name = name;
this.len = strlen(name);
this.hash = 0;
this.name = name;
this.len = strlen(name);
this.hash = 0;
- path.dentry = d_alloc
(anon_inode_mnt->mnt_sb->s_root
, &this);
+ path.dentry = d_alloc
_pseudo(anon_inode_mnt->mnt_sb
, &this);
if (!path.dentry)
goto err_module;
if (!path.dentry)
goto err_module;
@@
-113,7
+113,7
@@
struct file *anon_inode_getfile(const char *name,
*/
ihold(anon_inode_inode);
*/
ihold(anon_inode_inode);
-
path.dentry->d_op = &anon_inodefs_dentry_operations
;
+
d_set_d_op(path.dentry, &anon_inodefs_dentry_operations)
;
d_instantiate(path.dentry, anon_inode_inode);
error = -ENFILE;
d_instantiate(path.dentry, anon_inode_inode);
error = -ENFILE;
@@
-232,7
+232,7
@@
static int __init anon_inode_init(void)
return 0;
err_mntput:
return 0;
err_mntput:
- mntput(anon_inode_mnt);
+ mntput
_long
(anon_inode_mnt);
err_unregister_filesystem:
unregister_filesystem(&anon_inode_fs_type);
err_exit:
err_unregister_filesystem:
unregister_filesystem(&anon_inode_fs_type);
err_exit: