diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-12 16:59:34 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-12 20:03:43 -0500 |
commit | c74a1cbb3cac348f276fabc381758f5b0b4713b2 (patch) | |
tree | 5b403590e41b5e91fce25c69d50a23b920b3497f /arch/ia64/kernel/perfmon.c | |
parent | f772c4a6a320ec25d94ba951881474eeef1b7f48 (diff) |
pass default dentry_operations to mount_pseudo()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/ia64/kernel/perfmon.c')
-rw-r--r-- | arch/ia64/kernel/perfmon.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index d92d5b5161fc..ac76da099a6d 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
@@ -617,11 +617,14 @@ pfm_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, | |||
617 | return get_unmapped_area(file, addr, len, pgoff, flags); | 617 | return get_unmapped_area(file, addr, len, pgoff, flags); |
618 | } | 618 | } |
619 | 619 | ||
620 | /* forward declaration */ | ||
621 | static static const struct dentry_operations pfmfs_dentry_operations; | ||
620 | 622 | ||
621 | static struct dentry * | 623 | static struct dentry * |
622 | pfmfs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) | 624 | pfmfs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) |
623 | { | 625 | { |
624 | return mount_pseudo(fs_type, "pfm:", NULL, PFMFS_MAGIC); | 626 | return mount_pseudo(fs_type, "pfm:", NULL, &pfmfs_dentry_operations, |
627 | PFMFS_MAGIC); | ||
625 | } | 628 | } |
626 | 629 | ||
627 | static struct file_system_type pfm_fs_type = { | 630 | static struct file_system_type pfm_fs_type = { |
@@ -2232,7 +2235,6 @@ pfm_alloc_file(pfm_context_t *ctx) | |||
2232 | } | 2235 | } |
2233 | path.mnt = mntget(pfmfs_mnt); | 2236 | path.mnt = mntget(pfmfs_mnt); |
2234 | 2237 | ||
2235 | d_set_d_op(path.dentry, &pfmfs_dentry_operations); | ||
2236 | d_add(path.dentry, inode); | 2238 | d_add(path.dentry, inode); |
2237 | 2239 | ||
2238 | file = alloc_file(&path, FMODE_READ, &pfm_file_ops); | 2240 | file = alloc_file(&path, FMODE_READ, &pfm_file_ops); |