diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/atm/proc.c | 1 | ||||
| -rw-r--r-- | net/dccp/probe.c | 1 | ||||
| -rw-r--r-- | net/ipv4/tcp_probe.c | 1 | ||||
| -rw-r--r-- | net/mac80211/debugfs.c | 21 | ||||
| -rw-r--r-- | net/mac80211/debugfs_key.c | 2 | ||||
| -rw-r--r-- | net/mac80211/debugfs_netdev.c | 1 | ||||
| -rw-r--r-- | net/mac80211/debugfs_sta.c | 2 | ||||
| -rw-r--r-- | net/mac80211/rate.c | 1 | ||||
| -rw-r--r-- | net/mac80211/rc80211_minstrel_debugfs.c | 1 | ||||
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht_debugfs.c | 3 | ||||
| -rw-r--r-- | net/mac80211/rc80211_pid_debugfs.c | 1 | ||||
| -rw-r--r-- | net/netfilter/xt_recent.c | 1 | ||||
| -rw-r--r-- | net/nonet.c | 1 | ||||
| -rw-r--r-- | net/rfkill/core.c | 1 | ||||
| -rw-r--r-- | net/sctp/probe.c | 1 | ||||
| -rw-r--r-- | net/socket.c | 1 | ||||
| -rw-r--r-- | net/sunrpc/cache.c | 2 | ||||
| -rw-r--r-- | net/wireless/debugfs.c | 2 | 
18 files changed, 37 insertions, 7 deletions
diff --git a/net/atm/proc.c b/net/atm/proc.c index 6262aeae398..f85da0779e5 100644 --- a/net/atm/proc.c +++ b/net/atm/proc.c @@ -38,6 +38,7 @@ static ssize_t proc_dev_atm_read(struct file *file, char __user *buf,  static const struct file_operations proc_atm_dev_ops = {  	.owner =	THIS_MODULE,  	.read =		proc_dev_atm_read, +	.llseek =	noop_llseek,  };  static void add_stats(struct seq_file *seq, const char *aal, diff --git a/net/dccp/probe.c b/net/dccp/probe.c index 078e48d442f..33d0e6297c2 100644 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c @@ -149,6 +149,7 @@ static const struct file_operations dccpprobe_fops = {  	.owner	 = THIS_MODULE,  	.open	 = dccpprobe_open,  	.read    = dccpprobe_read, +	.llseek  = noop_llseek,  };  static __init int dccpprobe_init(void) diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c index f8efada580e..6211e211417 100644 --- a/net/ipv4/tcp_probe.c +++ b/net/ipv4/tcp_probe.c @@ -214,6 +214,7 @@ static const struct file_operations tcpprobe_fops = {  	.owner	 = THIS_MODULE,  	.open	 = tcpprobe_open,  	.read    = tcpprobe_read, +	.llseek  = noop_llseek,  };  static __init int tcpprobe_init(void) diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c index a694c593ff6..b8b0ae79a74 100644 --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c @@ -36,6 +36,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf,	\  static const struct file_operations name## _ops = {			\  	.read = name## _read,						\  	.open = mac80211_open_file_generic,				\ +	.llseek = generic_file_llseek,					\  };  #define DEBUGFS_ADD(name)						\ @@ -101,7 +102,8 @@ static ssize_t tsf_write(struct file *file,  static const struct file_operations tsf_ops = {  	.read = tsf_read,  	.write = tsf_write, -	.open = mac80211_open_file_generic +	.open = mac80211_open_file_generic, +	.llseek = default_llseek,  };  static ssize_t reset_write(struct file *file, const char __user *user_buf, @@ -120,6 +122,7 @@ static ssize_t reset_write(struct file *file, const char __user *user_buf,  static const struct file_operations reset_ops = {  	.write = reset_write,  	.open = mac80211_open_file_generic, +	.llseek = noop_llseek,  };  static ssize_t noack_read(struct file *file, char __user *user_buf, @@ -155,7 +158,8 @@ static ssize_t noack_write(struct file *file,  static const struct file_operations noack_ops = {  	.read = noack_read,  	.write = noack_write, -	.open = mac80211_open_file_generic +	.open = mac80211_open_file_generic, +	.llseek = default_llseek,  };  static ssize_t uapsd_queues_read(struct file *file, char __user *user_buf, @@ -201,7 +205,8 @@ static ssize_t uapsd_queues_write(struct file *file,  static const struct file_operations uapsd_queues_ops = {  	.read = uapsd_queues_read,  	.write = uapsd_queues_write, -	.open = mac80211_open_file_generic +	.open = mac80211_open_file_generic, +	.llseek = default_llseek,  };  static ssize_t uapsd_max_sp_len_read(struct file *file, char __user *user_buf, @@ -247,7 +252,8 @@ static ssize_t uapsd_max_sp_len_write(struct file *file,  static const struct file_operations uapsd_max_sp_len_ops = {  	.read = uapsd_max_sp_len_read,  	.write = uapsd_max_sp_len_write, -	.open = mac80211_open_file_generic +	.open = mac80211_open_file_generic, +	.llseek = default_llseek,  };  static ssize_t channel_type_read(struct file *file, char __user *user_buf, @@ -279,7 +285,8 @@ static ssize_t channel_type_read(struct file *file, char __user *user_buf,  static const struct file_operations channel_type_ops = {  	.read = channel_type_read, -	.open = mac80211_open_file_generic +	.open = mac80211_open_file_generic, +	.llseek = default_llseek,  };  static ssize_t queues_read(struct file *file, char __user *user_buf, @@ -302,7 +309,8 @@ static ssize_t queues_read(struct file *file, char __user *user_buf,  static const struct file_operations queues_ops = {  	.read = queues_read, -	.open = mac80211_open_file_generic +	.open = mac80211_open_file_generic, +	.llseek = default_llseek,  };  /* statistics stuff */ @@ -346,6 +354,7 @@ static ssize_t stats_ ##name## _read(struct file *file,			\  static const struct file_operations stats_ ##name## _ops = {		\  	.read = stats_ ##name## _read,					\  	.open = mac80211_open_file_generic,				\ +	.llseek = generic_file_llseek,					\  };  #define DEBUGFS_STATS_ADD(name, field)					\ diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c index fa5e76e658e..7cd8dd9fc24 100644 --- a/net/mac80211/debugfs_key.c +++ b/net/mac80211/debugfs_key.c @@ -32,6 +32,7 @@ static ssize_t key_##name##_read(struct file *file,			\  static const struct file_operations key_ ##name## _ops = {		\  	.read = key_##name##_read,					\  	.open = mac80211_open_file_generic,				\ +	.llseek = generic_file_llseek,					\  }  #define KEY_FILE(name, format)						\ @@ -46,6 +47,7 @@ static const struct file_operations key_ ##name## _ops = {		\  static const struct file_operations key_ ##name## _ops = {		\  	.read = key_conf_##name##_read,					\  	.open = mac80211_open_file_generic,				\ +	.llseek = generic_file_llseek,					\  }  #define KEY_CONF_FILE(name, format)					\ diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c index 20b2998fa0e..8ad33eef7dd 100644 --- a/net/mac80211/debugfs_netdev.c +++ b/net/mac80211/debugfs_netdev.c @@ -121,6 +121,7 @@ static const struct file_operations name##_ops = {			\  	.read = ieee80211_if_read_##name,				\  	.write = (_write),						\  	.open = mac80211_open_file_generic,				\ +	.llseek = generic_file_llseek,					\  }  #define __IEEE80211_IF_FILE_W(name)					\ diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index 76839d4dfaa..6a8fdc372c4 100644 --- a/net/mac80211/debugfs_sta.c +++ b/net/mac80211/debugfs_sta.c @@ -36,6 +36,7 @@ static ssize_t sta_ ##name## _read(struct file *file,			\  static const struct file_operations sta_ ##name## _ops = {		\  	.read = sta_##name##_read,					\  	.open = mac80211_open_file_generic,				\ +	.llseek = generic_file_llseek,					\  }  #define STA_OPS_RW(name)						\ @@ -43,6 +44,7 @@ static const struct file_operations sta_ ##name## _ops = {		\  	.read = sta_##name##_read,					\  	.write = sta_##name##_write,					\  	.open = mac80211_open_file_generic,				\ +	.llseek = generic_file_llseek,					\  }  #define STA_FILE(name, field, format)					\ diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index be04d46110f..334cbd3d2aa 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -145,6 +145,7 @@ static ssize_t rcname_read(struct file *file, char __user *userbuf,  static const struct file_operations rcname_ops = {  	.read = rcname_read,  	.open = mac80211_open_file_generic, +	.llseek = default_llseek,  };  #endif diff --git a/net/mac80211/rc80211_minstrel_debugfs.c b/net/mac80211/rc80211_minstrel_debugfs.c index 241e76f3fdf..a290ad231d7 100644 --- a/net/mac80211/rc80211_minstrel_debugfs.c +++ b/net/mac80211/rc80211_minstrel_debugfs.c @@ -122,6 +122,7 @@ static const struct file_operations minstrel_stat_fops = {  	.open = minstrel_stats_open,  	.read = minstrel_stats_read,  	.release = minstrel_stats_release, +	.llseek = default_llseek,  };  void diff --git a/net/mac80211/rc80211_minstrel_ht_debugfs.c b/net/mac80211/rc80211_minstrel_ht_debugfs.c index 4a5a4b3e779..cefcb5d2dae 100644 --- a/net/mac80211/rc80211_minstrel_ht_debugfs.c +++ b/net/mac80211/rc80211_minstrel_ht_debugfs.c @@ -90,7 +90,7 @@ minstrel_ht_stats_open(struct inode *inode, struct file *file)  		MINSTREL_TRUNC(mi->avg_ampdu_len * 10) % 10);  	ms->len = p - ms->buf; -	return 0; +	return nonseekable_open(inode, file);  }  static const struct file_operations minstrel_ht_stat_fops = { @@ -98,6 +98,7 @@ static const struct file_operations minstrel_ht_stat_fops = {  	.open = minstrel_ht_stats_open,  	.read = minstrel_stats_read,  	.release = minstrel_stats_release, +	.llseek = no_llseek,  };  void diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c index 47438b4a9af..7905f79cc2e 100644 --- a/net/mac80211/rc80211_pid_debugfs.c +++ b/net/mac80211/rc80211_pid_debugfs.c @@ -206,6 +206,7 @@ static const struct file_operations rc_pid_fop_events = {  	.poll = rate_control_pid_events_poll,  	.open = rate_control_pid_events_open,  	.release = rate_control_pid_events_release, +	.llseek = noop_llseek,  };  void rate_control_pid_add_sta_debugfs(void *priv, void *priv_sta, diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c index 76aec6a4476..d2ff15a2412 100644 --- a/net/netfilter/xt_recent.c +++ b/net/netfilter/xt_recent.c @@ -567,6 +567,7 @@ static const struct file_operations recent_mt_fops = {  	.write   = recent_mt_proc_write,  	.release = seq_release_private,  	.owner   = THIS_MODULE, +	.llseek = seq_lseek,  };  static int __net_init recent_proc_net_init(struct net *net) diff --git a/net/nonet.c b/net/nonet.c index 92e76640c7c..b1a73fda9c1 100644 --- a/net/nonet.c +++ b/net/nonet.c @@ -22,4 +22,5 @@ static int sock_no_open(struct inode *irrelevant, struct file *dontcare)  const struct file_operations bad_sock_fops = {  	.owner = THIS_MODULE,  	.open = sock_no_open, +	.llseek = noop_llseek,  }; diff --git a/net/rfkill/core.c b/net/rfkill/core.c index 51875a0c5d4..04f599089e6 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -1241,6 +1241,7 @@ static const struct file_operations rfkill_fops = {  	.unlocked_ioctl	= rfkill_fop_ioctl,  	.compat_ioctl	= rfkill_fop_ioctl,  #endif +	.llseek		= no_llseek,  };  static struct miscdevice rfkill_miscdev = { diff --git a/net/sctp/probe.c b/net/sctp/probe.c index db3a42b8b34..289b1ba62ca 100644 --- a/net/sctp/probe.c +++ b/net/sctp/probe.c @@ -117,6 +117,7 @@ static const struct file_operations sctpprobe_fops = {  	.owner	= THIS_MODULE,  	.open	= sctpprobe_open,  	.read	= sctpprobe_read, +	.llseek = noop_llseek,  };  sctp_disposition_t jsctp_sf_eat_sack(const struct sctp_endpoint *ep, diff --git a/net/socket.c b/net/socket.c index 2270b941bcc..9eac5c39413 100644 --- a/net/socket.c +++ b/net/socket.c @@ -502,6 +502,7 @@ static int sock_no_open(struct inode *irrelevant, struct file *dontcare)  const struct file_operations bad_sock_fops = {  	.owner = THIS_MODULE,  	.open = sock_no_open, +	.llseek = noop_llseek,  };  /** diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 29b11e06501..7dce81a926c 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -1435,6 +1435,7 @@ static const struct file_operations cache_flush_operations_procfs = {  	.read		= read_flush_procfs,  	.write		= write_flush_procfs,  	.release	= release_flush_procfs, +	.llseek		= no_llseek,  };  static void remove_cache_proc_entries(struct cache_detail *cd) @@ -1635,6 +1636,7 @@ const struct file_operations cache_flush_operations_pipefs = {  	.read		= read_flush_pipefs,  	.write		= write_flush_pipefs,  	.release	= release_flush_pipefs, +	.llseek		= no_llseek,  };  int sunrpc_cache_register_pipefs(struct dentry *parent, diff --git a/net/wireless/debugfs.c b/net/wireless/debugfs.c index a4991a3efec..39765bcfb47 100644 --- a/net/wireless/debugfs.c +++ b/net/wireless/debugfs.c @@ -34,6 +34,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf,	\  static const struct file_operations name## _ops = {			\  	.read = name## _read,						\  	.open = cfg80211_open_file_generic,				\ +	.llseek = generic_file_llseek,					\  };  DEBUGFS_READONLY_FILE(rts_threshold, 20, "%d", @@ -102,6 +103,7 @@ static ssize_t ht40allow_map_read(struct file *file,  static const struct file_operations ht40allow_map_ops = {  	.read = ht40allow_map_read,  	.open = cfg80211_open_file_generic, +	.llseek = default_llseek,  };  #define DEBUGFS_ADD(name)						\  |