diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-10-25 18:47:37 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-11-15 22:04:17 -0500 |
commit | b26d4cd385fc51e8844e2cdf9ba2051f5bba11a5 (patch) | |
tree | fcfa7a889b494945abf5705562c0384f88924f78 /arch/ia64/kernel/perfmon.c | |
parent | 951b4bd553e35a291e6b5732ab0124619e81da05 (diff) |
consolidate simple ->d_delete() instances
Rename simple_delete_dentry() to always_delete_dentry() and export it.
Export simple_dentry_operations, while we are at it, and get rid of
their duplicates
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 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 5a9ff1c3c3e9..cb592773c78b 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
@@ -2166,12 +2166,6 @@ static const struct file_operations pfm_file_ops = { | |||
2166 | .flush = pfm_flush | 2166 | .flush = pfm_flush |
2167 | }; | 2167 | }; |
2168 | 2168 | ||
2169 | static int | ||
2170 | pfmfs_delete_dentry(const struct dentry *dentry) | ||
2171 | { | ||
2172 | return 1; | ||
2173 | } | ||
2174 | |||
2175 | static char *pfmfs_dname(struct dentry *dentry, char *buffer, int buflen) | 2169 | static char *pfmfs_dname(struct dentry *dentry, char *buffer, int buflen) |
2176 | { | 2170 | { |
2177 | return dynamic_dname(dentry, buffer, buflen, "pfm:[%lu]", | 2171 | return dynamic_dname(dentry, buffer, buflen, "pfm:[%lu]", |
@@ -2179,7 +2173,7 @@ static char *pfmfs_dname(struct dentry *dentry, char *buffer, int buflen) | |||
2179 | } | 2173 | } |
2180 | 2174 | ||
2181 | static const struct dentry_operations pfmfs_dentry_operations = { | 2175 | static const struct dentry_operations pfmfs_dentry_operations = { |
2182 | .d_delete = pfmfs_delete_dentry, | 2176 | .d_delete = always_delete_dentry, |
2183 | .d_dname = pfmfs_dname, | 2177 | .d_dname = pfmfs_dname, |
2184 | }; | 2178 | }; |
2185 | 2179 | ||