aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/oprofile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-22 13:52:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-22 13:52:56 -0400
commit092e0e7e520a1fca03e13c9f2d157432a8657ff2 (patch)
tree451897252c4c08c4b5a8ef535da156f1e817e80b /drivers/oprofile
parent79f14b7c56d3b3ba58f8b43d1f70b9b71477a800 (diff)
parent776c163b1b93c8dfa5edba885bc2bfbc2d228a5f (diff)
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl: vfs: make no_llseek the default vfs: don't use BKL in default_llseek llseek: automatically add .llseek fop libfs: use generic_file_llseek for simple_attr mac80211: disallow seeks in minstrel debug code lirc: make chardev nonseekable viotape: use noop_llseek raw: use explicit llseek file operations ibmasmfs: use generic_file_llseek spufs: use llseek in all file operations arm/omap: use generic_file_llseek in iommu_debug lkdtm: use generic_file_llseek in debugfs net/wireless: use generic_file_llseek in debugfs drm: use noop_llseek
Diffstat (limited to 'drivers/oprofile')
-rw-r--r--drivers/oprofile/oprofile_files.c8
-rw-r--r--drivers/oprofile/oprofilefs.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
index ccf099e684a4..89f63456646f 100644
--- a/drivers/oprofile/oprofile_files.c
+++ b/drivers/oprofile/oprofile_files.c
@@ -59,6 +59,7 @@ static ssize_t timeout_write(struct file *file, char const __user *buf,
59static const struct file_operations timeout_fops = { 59static const struct file_operations timeout_fops = {
60 .read = timeout_read, 60 .read = timeout_read,
61 .write = timeout_write, 61 .write = timeout_write,
62 .llseek = default_llseek,
62}; 63};
63 64
64#endif 65#endif
@@ -96,7 +97,8 @@ static ssize_t depth_write(struct file *file, char const __user *buf, size_t cou
96 97
97static const struct file_operations depth_fops = { 98static const struct file_operations depth_fops = {
98 .read = depth_read, 99 .read = depth_read,
99 .write = depth_write 100 .write = depth_write,
101 .llseek = default_llseek,
100}; 102};
101 103
102 104
@@ -108,6 +110,7 @@ static ssize_t pointer_size_read(struct file *file, char __user *buf, size_t cou
108 110
109static const struct file_operations pointer_size_fops = { 111static const struct file_operations pointer_size_fops = {
110 .read = pointer_size_read, 112 .read = pointer_size_read,
113 .llseek = default_llseek,
111}; 114};
112 115
113 116
@@ -119,6 +122,7 @@ static ssize_t cpu_type_read(struct file *file, char __user *buf, size_t count,
119 122
120static const struct file_operations cpu_type_fops = { 123static const struct file_operations cpu_type_fops = {
121 .read = cpu_type_read, 124 .read = cpu_type_read,
125 .llseek = default_llseek,
122}; 126};
123 127
124 128
@@ -154,6 +158,7 @@ static ssize_t enable_write(struct file *file, char const __user *buf, size_t co
154static const struct file_operations enable_fops = { 158static const struct file_operations enable_fops = {
155 .read = enable_read, 159 .read = enable_read,
156 .write = enable_write, 160 .write = enable_write,
161 .llseek = default_llseek,
157}; 162};
158 163
159 164
@@ -166,6 +171,7 @@ static ssize_t dump_write(struct file *file, char const __user *buf, size_t coun
166 171
167static const struct file_operations dump_fops = { 172static const struct file_operations dump_fops = {
168 .write = dump_write, 173 .write = dump_write,
174 .llseek = noop_llseek,
169}; 175};
170 176
171void oprofile_create_files(struct super_block *sb, struct dentry *root) 177void oprofile_create_files(struct super_block *sb, struct dentry *root)
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
index 1944621930d9..95f711b251ad 100644
--- a/drivers/oprofile/oprofilefs.c
+++ b/drivers/oprofile/oprofilefs.c
@@ -121,12 +121,14 @@ static const struct file_operations ulong_fops = {
121 .read = ulong_read_file, 121 .read = ulong_read_file,
122 .write = ulong_write_file, 122 .write = ulong_write_file,
123 .open = default_open, 123 .open = default_open,
124 .llseek = default_llseek,
124}; 125};
125 126
126 127
127static const struct file_operations ulong_ro_fops = { 128static const struct file_operations ulong_ro_fops = {
128 .read = ulong_read_file, 129 .read = ulong_read_file,
129 .open = default_open, 130 .open = default_open,
131 .llseek = default_llseek,
130}; 132};
131 133
132 134
@@ -178,6 +180,7 @@ static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t coun
178static const struct file_operations atomic_ro_fops = { 180static const struct file_operations atomic_ro_fops = {
179 .read = atomic_read_file, 181 .read = atomic_read_file,
180 .open = default_open, 182 .open = default_open,
183 .llseek = default_llseek,
181}; 184};
182 185
183 186