diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2012-04-05 17:25:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-05 18:25:50 -0400 |
commit | 234e340582901211f40d8c732afc49f0630ecf05 (patch) | |
tree | 753076500dfd883b3db56d4f5410af31d8945623 /fs/debugfs | |
parent | 9b3ae64be658a573b33d05a8dc73b08d3345fa44 (diff) |
simple_open: automatically convert to simple_open()
Many users of debugfs copy the implementation of default_open() when
they want to support a custom read/write function op. This leads to a
proliferation of the default_open() implementation across the entire
tree.
Now that the common implementation has been consolidated into libfs we
can replace all the users of this function with simple_open().
This replacement was done with the following semantic patch:
<smpl>
@ open @
identifier open_f != simple_open;
identifier i, f;
@@
-int open_f(struct inode *i, struct file *f)
-{
(
-if (i->i_private)
-f->private_data = i->i_private;
|
-f->private_data = i->i_private;
)
-return 0;
-}
@ has_open depends on open @
identifier fops;
identifier open.open_f;
@@
struct file_operations fops = {
...
-.open = open_f,
+.open = simple_open,
...
};
</smpl>
[akpm@linux-foundation.org: checkpatch fixes]
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/debugfs')
-rw-r--r-- | fs/debugfs/file.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index 21e93605161c..5dfafdd1dbd3 100644 --- a/fs/debugfs/file.c +++ b/fs/debugfs/file.c | |||
@@ -33,18 +33,10 @@ static ssize_t default_write_file(struct file *file, const char __user *buf, | |||
33 | return count; | 33 | return count; |
34 | } | 34 | } |
35 | 35 | ||
36 | static int default_open(struct inode *inode, struct file *file) | ||
37 | { | ||
38 | if (inode->i_private) | ||
39 | file->private_data = inode->i_private; | ||
40 | |||
41 | return 0; | ||
42 | } | ||
43 | |||
44 | const struct file_operations debugfs_file_operations = { | 36 | const struct file_operations debugfs_file_operations = { |
45 | .read = default_read_file, | 37 | .read = default_read_file, |
46 | .write = default_write_file, | 38 | .write = default_write_file, |
47 | .open = default_open, | 39 | .open = simple_open, |
48 | .llseek = noop_llseek, | 40 | .llseek = noop_llseek, |
49 | }; | 41 | }; |
50 | 42 | ||
@@ -447,7 +439,7 @@ static ssize_t write_file_bool(struct file *file, const char __user *user_buf, | |||
447 | static const struct file_operations fops_bool = { | 439 | static const struct file_operations fops_bool = { |
448 | .read = read_file_bool, | 440 | .read = read_file_bool, |
449 | .write = write_file_bool, | 441 | .write = write_file_bool, |
450 | .open = default_open, | 442 | .open = simple_open, |
451 | .llseek = default_llseek, | 443 | .llseek = default_llseek, |
452 | }; | 444 | }; |
453 | 445 | ||
@@ -492,7 +484,7 @@ static ssize_t read_file_blob(struct file *file, char __user *user_buf, | |||
492 | 484 | ||
493 | static const struct file_operations fops_blob = { | 485 | static const struct file_operations fops_blob = { |
494 | .read = read_file_blob, | 486 | .read = read_file_blob, |
495 | .open = default_open, | 487 | .open = simple_open, |
496 | .llseek = default_llseek, | 488 | .llseek = default_llseek, |
497 | }; | 489 | }; |
498 | 490 | ||