diff options
Diffstat (limited to 'fs/debugfs')
-rw-r--r-- | fs/debugfs/file.c | 3 | ||||
-rw-r--r-- | fs/debugfs/inode.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index 0210898458b2..89d394d8fe24 100644 --- a/fs/debugfs/file.c +++ b/fs/debugfs/file.c | |||
@@ -43,6 +43,7 @@ const struct file_operations debugfs_file_operations = { | |||
43 | .read = default_read_file, | 43 | .read = default_read_file, |
44 | .write = default_write_file, | 44 | .write = default_write_file, |
45 | .open = default_open, | 45 | .open = default_open, |
46 | .llseek = noop_llseek, | ||
46 | }; | 47 | }; |
47 | 48 | ||
48 | static void *debugfs_follow_link(struct dentry *dentry, struct nameidata *nd) | 49 | static void *debugfs_follow_link(struct dentry *dentry, struct nameidata *nd) |
@@ -454,6 +455,7 @@ static const struct file_operations fops_bool = { | |||
454 | .read = read_file_bool, | 455 | .read = read_file_bool, |
455 | .write = write_file_bool, | 456 | .write = write_file_bool, |
456 | .open = default_open, | 457 | .open = default_open, |
458 | .llseek = default_llseek, | ||
457 | }; | 459 | }; |
458 | 460 | ||
459 | /** | 461 | /** |
@@ -498,6 +500,7 @@ static ssize_t read_file_blob(struct file *file, char __user *user_buf, | |||
498 | static const struct file_operations fops_blob = { | 500 | static const struct file_operations fops_blob = { |
499 | .read = read_file_blob, | 501 | .read = read_file_blob, |
500 | .open = default_open, | 502 | .open = default_open, |
503 | .llseek = default_llseek, | ||
501 | }; | 504 | }; |
502 | 505 | ||
503 | /** | 506 | /** |
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index 30a87b3dbcac..37a8ca7c1222 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c | |||
@@ -40,6 +40,7 @@ static struct inode *debugfs_get_inode(struct super_block *sb, int mode, dev_t d | |||
40 | struct inode *inode = new_inode(sb); | 40 | struct inode *inode = new_inode(sb); |
41 | 41 | ||
42 | if (inode) { | 42 | if (inode) { |
43 | inode->i_ino = get_next_ino(); | ||
43 | inode->i_mode = mode; | 44 | inode->i_mode = mode; |
44 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 45 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
45 | switch (mode & S_IFMT) { | 46 | switch (mode & S_IFMT) { |
@@ -134,17 +135,17 @@ static int debug_fill_super(struct super_block *sb, void *data, int silent) | |||
134 | return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); | 135 | return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); |
135 | } | 136 | } |
136 | 137 | ||
137 | static int debug_get_sb(struct file_system_type *fs_type, | 138 | static struct dentry *debug_mount(struct file_system_type *fs_type, |
138 | int flags, const char *dev_name, | 139 | int flags, const char *dev_name, |
139 | void *data, struct vfsmount *mnt) | 140 | void *data) |
140 | { | 141 | { |
141 | return get_sb_single(fs_type, flags, data, debug_fill_super, mnt); | 142 | return mount_single(fs_type, flags, data, debug_fill_super); |
142 | } | 143 | } |
143 | 144 | ||
144 | static struct file_system_type debug_fs_type = { | 145 | static struct file_system_type debug_fs_type = { |
145 | .owner = THIS_MODULE, | 146 | .owner = THIS_MODULE, |
146 | .name = "debugfs", | 147 | .name = "debugfs", |
147 | .get_sb = debug_get_sb, | 148 | .mount = debug_mount, |
148 | .kill_sb = kill_litter_super, | 149 | .kill_sb = kill_litter_super, |
149 | }; | 150 | }; |
150 | 151 | ||