Not all users match that model, but quite a few do. No mindless mass conversions, please... Added: CLASS(filename, name)(user_path) => getname(user_path) CLASS(filename_kernel, name)(string) => getname_kernel(string) CLASS(filename_flags, name)(user_path, flags) => getname_flags(user_path, flags) CLASS(filename_uflags, name)(user_path, flags) => getname_uflags(user_path, flags) CLASS(filename_maybe_null, name)(user_path, flags) => getname_maybe_null(user_path, flags) CLASS(filename_complete_delayed, name)(delayed) => complete_getname(delayed) CLASS(filename_consume, name)(filename) => no_free_ptr(filename) all with putname() as destructor. "flags" in filename_flags() is in LOOKUP_... space, only LOOKUP_EMPTY matters. "flags" in filename_uflags() and filename_maybe_null() is in AT_...... space, and only AT_EMPTY_PATH matters. These conventions might be worth reconsidering... Signed-off-by: Al Viro --- include/linux/fs.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/linux/fs.h b/include/linux/fs.h index b711f46ba8f5..db0d89dd1229 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2527,6 +2527,14 @@ void dismiss_delayed_filename(struct delayed_filename *); int putname_to_delayed(struct delayed_filename *, struct filename *); struct filename *complete_getname(struct delayed_filename *); +DEFINE_CLASS(filename, struct filename *, putname(_T), getname(p), const char __user *p) +EXTEND_CLASS(filename, _kernel, getname_kernel(p), const char *p) +EXTEND_CLASS(filename, _flags, getname_flags(p, f), const char __user *p, unsigned int f) +EXTEND_CLASS(filename, _uflags, getname_uflags(p, f), const char __user *p, unsigned int f) +EXTEND_CLASS(filename, _maybe_null, getname_maybe_null(p, f), const char __user *p, unsigned int f) +EXTEND_CLASS(filename, _consume, no_free_ptr(p), struct filename *p) +EXTEND_CLASS(filename, _complete_delayed, complete_getname(p), struct delayed_filename *p) + extern int finish_open(struct file *file, struct dentry *dentry, int (*open)(struct inode *, struct file *)); extern int finish_no_open(struct file *file, struct dentry *dentry); -- 2.47.3