diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-01-11 01:23:41 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-01-11 01:23:41 +0300 |
| commit | 274353674dd0337bdeeaee08a9f2047777b07ab0 (patch) | |
| tree | b788d77dd7c0e8f27bbcc89fc742c212c28872c0 /fs/anon_inodes.c | |
| parent | 1740d483ba4d79f9fa6984dccd7152b6b208f1bf (diff) | |
| parent | d7cd5c73cec2dfa9f259a2adcf802c9f8fcc125f (diff) | |
| download | linux-274353674dd0337bdeeaee08a9f2047777b07ab0.tar.xz | |
Merge branch 'ehci-omap-clock' into omap-fixes
Diffstat (limited to 'fs/anon_inodes.c')
| -rw-r--r-- | fs/anon_inodes.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c index 57ce55b2564c..5fd38112a6ca 100644 --- 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; - 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; @@ -113,7 +113,7 @@ struct file *anon_inode_getfile(const char *name, */ 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; @@ -232,7 +232,7 @@ static int __init anon_inode_init(void) return 0; err_mntput: - mntput(anon_inode_mnt); + mntput_long(anon_inode_mnt); err_unregister_filesystem: unregister_filesystem(&anon_inode_fs_type); err_exit: |