diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-23 14:02:19 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-23 14:02:19 -0500 |
| commit | 99a85b901eb54f62ff0c3fd6eb56e60b7b9f15c8 (patch) | |
| tree | 0c6637b7d2172e079c30e966847326767cbaf45c /include/linux/debugfs.h | |
| parent | 135f9be9194cf7778eb73594aa55791b229cf27c (diff) | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
Merge tag 'v4.0-rc1' into patchwork
Linux 34.0-rc1
* tag 'v4.0-rc1': (8947 commits)
Linux 4.0-rc1
autofs4 copy_dev_ioctl(): keep the value of ->size we'd used for allocation
procfs: fix race between symlink removals and traversals
debugfs: leave freeing a symlink body until inode eviction
Documentation/filesystems/Locking: ->get_sb() is long gone
trylock_super(): replacement for grab_super_passive()
fanotify: Fix up scripted S_ISDIR/S_ISREG/S_ISLNK conversions
Cachefiles: Fix up scripted S_ISDIR/S_ISREG/S_ISLNK conversions
VFS: (Scripted) Convert S_ISLNK/DIR/REG(dentry->d_inode) to d_is_*(dentry)
SELinux: Use d_is_positive() rather than testing dentry->d_inode
Smack: Use d_is_positive() rather than testing dentry->d_inode
TOMOYO: Use d_is_dir() rather than d_inode and S_ISDIR()
Apparmor: Use d_is_positive/negative() rather than testing dentry->d_inode
Apparmor: mediated_filesystem() should use dentry->d_sb not inode->i_sb
VFS: Split DCACHE_FILE_TYPE into regular and special types
VFS: Add a fallthrough flag for marking virtual dentries
VFS: Add a whiteout dentry type
VFS: Introduce inode-getting helpers for layered/unioned fs environments
kernel: make READ_ONCE() valid on const arguments
blk-throttle: check stats_cpu before reading it from sysfs
...
Diffstat (limited to 'include/linux/debugfs.h')
| -rw-r--r-- | include/linux/debugfs.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h index da4c4983adbe..cb25af461054 100644 --- a/include/linux/debugfs.h +++ b/include/linux/debugfs.h | |||
| @@ -51,11 +51,21 @@ struct dentry *debugfs_create_file(const char *name, umode_t mode, | |||
| 51 | struct dentry *parent, void *data, | 51 | struct dentry *parent, void *data, |
| 52 | const struct file_operations *fops); | 52 | const struct file_operations *fops); |
| 53 | 53 | ||
| 54 | struct dentry *debugfs_create_file_size(const char *name, umode_t mode, | ||
| 55 | struct dentry *parent, void *data, | ||
| 56 | const struct file_operations *fops, | ||
| 57 | loff_t file_size); | ||
| 58 | |||
| 54 | struct dentry *debugfs_create_dir(const char *name, struct dentry *parent); | 59 | struct dentry *debugfs_create_dir(const char *name, struct dentry *parent); |
| 55 | 60 | ||
| 56 | struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent, | 61 | struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent, |
| 57 | const char *dest); | 62 | const char *dest); |
| 58 | 63 | ||
| 64 | struct dentry *debugfs_create_automount(const char *name, | ||
| 65 | struct dentry *parent, | ||
| 66 | struct vfsmount *(*f)(void *), | ||
| 67 | void *data); | ||
| 68 | |||
| 59 | void debugfs_remove(struct dentry *dentry); | 69 | void debugfs_remove(struct dentry *dentry); |
| 60 | void debugfs_remove_recursive(struct dentry *dentry); | 70 | void debugfs_remove_recursive(struct dentry *dentry); |
| 61 | 71 | ||
| @@ -124,6 +134,14 @@ static inline struct dentry *debugfs_create_file(const char *name, umode_t mode, | |||
| 124 | return ERR_PTR(-ENODEV); | 134 | return ERR_PTR(-ENODEV); |
| 125 | } | 135 | } |
| 126 | 136 | ||
| 137 | static inline struct dentry *debugfs_create_file_size(const char *name, umode_t mode, | ||
| 138 | struct dentry *parent, void *data, | ||
| 139 | const struct file_operations *fops, | ||
| 140 | loff_t file_size) | ||
| 141 | { | ||
| 142 | return ERR_PTR(-ENODEV); | ||
| 143 | } | ||
| 144 | |||
| 127 | static inline struct dentry *debugfs_create_dir(const char *name, | 145 | static inline struct dentry *debugfs_create_dir(const char *name, |
| 128 | struct dentry *parent) | 146 | struct dentry *parent) |
| 129 | { | 147 | { |
