diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 10:52:56 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 10:52:56 -0700 | 
| commit | 092e0e7e520a1fca03e13c9f2d157432a8657ff2 (patch) | |
| tree | 451897252c4c08c4b5a8ef535da156f1e817e80b /net/sunrpc/cache.c | |
| parent | 79f14b7c56d3b3ba58f8b43d1f70b9b71477a800 (diff) | |
| parent | 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f (diff) | |
| download | olio-linux-3.10-092e0e7e520a1fca03e13c9f2d157432a8657ff2.tar.xz olio-linux-3.10-092e0e7e520a1fca03e13c9f2d157432a8657ff2.zip  | |
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 'net/sunrpc/cache.c')
| -rw-r--r-- | net/sunrpc/cache.c | 2 | 
1 files changed, 2 insertions, 0 deletions
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,  |