linux-stable.git/fs/nfs/blocklayout, branch linux-3.16.y

nfs: merge nfs_pgio_data into _header

2014-10-05T20:41:00+00:00

commit d45f60c67848b9f19160692581d78e5b4757a000 upstream.

struct nfs_pgio_data only exists as a member of nfs_pgio_header, but is
passed around everywhere, because there used to be multiple _data structs
per _header. Many of these functions then use the _data to find a pointer
to the _header.  This patch cleans this up by merging the nfs_pgio_data
structure into nfs_pgio_header and passing nfs_pgio_header around instead.

Reviewed-by: Christoph Hellwig 
Signed-off-by: Weston Andros Adamson 
Signed-off-by: Trond Myklebust 
Signed-off-by: Greg Kroah-Hartman

nfs: rename members of nfs_pgio_data

2014-10-05T20:41:00+00:00

commit 823b0c9d9800e712374cda89ac3565bd29f6701b upstream.

Rename "verf" to "writeverf" and "pages" to "page_array" to prepare for
merge of nfs_pgio_data and nfs_pgio_header.

Reviewed-by: Christoph Hellwig 
Signed-off-by: Weston Andros Adamson 
Signed-off-by: Trond Myklebust 
Signed-off-by: Greg Kroah-Hartman

nfs: modify pg_test interface to return size_t

2014-05-29T15:11:43+00:00

This is a step toward allowing pg_test to inform the the
coalescing code to reduce the size of requests so they may fit in
whatever scheme the pg_test callback wants to define.

For now, just return the size of the request if there is space, or 0
if there is not.  This shouldn't change any behavior as it acts
the same as when the pg_test functions returned bool.

Signed-off-by: Weston Andros Adamson 
Signed-off-by: Trond Myklebust

NFS: Create a common read and write data struct

2014-05-28T22:12:47+00:00

At this point, the only difference between nfs_read_data and
nfs_write_data is the write verifier.

Signed-off-by: Anna Schumaker 
Signed-off-by: Trond Myklebust

mm: filemap: move radix tree hole searching here

2014-04-03T23:21:00+00:00

The radix tree hole searching code is only used for page cache, for
example the readahead code trying to get a a picture of the area
surrounding a fault.

It sufficed to rely on the radix tree definition of holes, which is
"empty tree slot".  But this is about to change, though, as shadow page
descriptors will be stored in the page cache after the actual pages get
evicted from memory.

Move the functions over to mm/filemap.c and make them native page cache
operations, where they can later be adapted to handle the new definition
of "page cache hole".

Signed-off-by: Johannes Weiner 
Reviewed-by: Rik van Riel 
Reviewed-by: Minchan Kim 
Acked-by: Mel Gorman 
Cc: Andrea Arcangeli 
Cc: Bob Liu 
Cc: Christoph Hellwig 
Cc: Dave Chinner 
Cc: Greg Thelen 
Cc: Hugh Dickins 
Cc: Jan Kara 
Cc: KOSAKI Motohiro 
Cc: Luigi Semenzato 
Cc: Metin Doslu 
Cc: Michel Lespinasse 
Cc: Ozgun Erdogan 
Cc: Peter Zijlstra 
Cc: Roman Gushchin 
Cc: Ryan Mallon 
Cc: Tejun Heo 
Cc: Vlastimil Babka 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Merge tag 'v3.13-rc6' into for-3.14/core

2013-12-31T16:51:02+00:00

Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.

Fixup merge issues related to the immutable biovec changes.

Signed-off-by: Jens Axboe 

Conflicts:
	block/blk-flush.c
	fs/btrfs/check-integrity.c
	fs/btrfs/extent_io.c
	fs/btrfs/scrub.c
	fs/logfs/dev_bdev.c

nfs: fix do_div() warning by instead using sector_div()

2013-12-04T17:57:37+00:00

When compiling a 32bit kernel with CONFIG_LBDAF=n the compiler complains like
shown below.  Fix this warning by instead using sector_div() which is provided
by the kernel.h header file.

fs/nfs/blocklayout/extents.c: In function ‘normalize’:
include/asm-generic/div64.h:43:28: warning: comparison of distinct pointer types lacks a cast [enabled by default]
fs/nfs/blocklayout/extents.c:47:13: note: in expansion of macro ‘do_div’
nfs/blocklayout/extents.c:47:2: warning: right shift count >= width of type [enabled by default]
fs/nfs/blocklayout/extents.c:47:2: warning: passing argument 1 of ‘__div64_32’ from incompatible pointer type [enabled by default]
include/asm-generic/div64.h:35:17: note: expected ‘uint64_t *’ but argument is of type ‘sector_t *’
 extern uint32_t __div64_32(uint64_t *dividend, uint32_t divisor);

Signed-off-by: Helge Deller 
Signed-off-by: Trond Myklebust

block: Abstract out bvec iterator

2013-11-24T06:33:47+00:00

Immutable biovecs are going to require an explicit iterator. To
implement immutable bvecs, a later patch is going to add a bi_bvec_done
member to this struct; for now, this patch effectively just renames
things.

Signed-off-by: Kent Overstreet 
Cc: Jens Axboe 
Cc: Geert Uytterhoeven 
Cc: Benjamin Herrenschmidt 
Cc: Paul Mackerras 
Cc: "Ed L. Cashin" 
Cc: Nick Piggin 
Cc: Lars Ellenberg 
Cc: Jiri Kosina 
Cc: Matthew Wilcox 
Cc: Geoff Levand 
Cc: Yehuda Sadeh 
Cc: Sage Weil 
Cc: Alex Elder 
Cc: ceph-devel@vger.kernel.org
Cc: Joshua Morris 
Cc: Philip Kelleher 
Cc: Rusty Russell 
Cc: "Michael S. Tsirkin" 
Cc: Konrad Rzeszutek Wilk 
Cc: Jeremy Fitzhardinge 
Cc: Neil Brown 
Cc: Alasdair Kergon 
Cc: Mike Snitzer 
Cc: dm-devel@redhat.com
Cc: Martin Schwidefsky 
Cc: Heiko Carstens 
Cc: linux390@de.ibm.com
Cc: Boaz Harrosh 
Cc: Benny Halevy 
Cc: "James E.J. Bottomley" 
Cc: Greg Kroah-Hartman 
Cc: "Nicholas A. Bellinger" 
Cc: Alexander Viro 
Cc: Chris Mason 
Cc: "Theodore Ts'o" 
Cc: Andreas Dilger 
Cc: Jaegeuk Kim 
Cc: Steven Whitehouse 
Cc: Dave Kleikamp 
Cc: Joern Engel 
Cc: Prasad Joshi 
Cc: Trond Myklebust 
Cc: KONISHI Ryusuke 
Cc: Mark Fasheh 
Cc: Joel Becker 
Cc: Ben Myers 
Cc: xfs@oss.sgi.com
Cc: Steven Rostedt 
Cc: Frederic Weisbecker 
Cc: Ingo Molnar 
Cc: Len Brown 
Cc: Pavel Machek 
Cc: "Rafael J. Wysocki" 
Cc: Herton Ronaldo Krzesinski 
Cc: Ben Hutchings 
Cc: Andrew Morton 
Cc: Guo Chao 
Cc: Tejun Heo 
Cc: Asai Thambi S P 
Cc: Selvan Mani 
Cc: Sam Bradshaw 
Cc: Wei Yongjun 
Cc: "Roger Pau Monné" 
Cc: Jan Beulich 
Cc: Stefano Stabellini 
Cc: Ian Campbell 
Cc: Sebastian Ott 
Cc: Christian Borntraeger 
Cc: Minchan Kim 
Cc: Jiang Liu 
Cc: Nitin Gupta 
Cc: Jerome Marchand 
Cc: Joe Perches 
Cc: Peng Tao 
Cc: Andy Adamson 
Cc: fanchaoting 
Cc: Jie Liu 
Cc: Sunil Mushran 
Cc: "Martin K. Petersen" 
Cc: Namjae Jeon 
Cc: Pankaj Kumar 
Cc: Dan Magenheimer 
Cc: Mel Gorman 6

block: Convert various code to bio_for_each_segment()

2013-11-24T06:33:46+00:00

With immutable biovecs we don't want code accessing bi_io_vec directly -
the uses this patch changes weren't incorrect since they all own the
bio, but it makes the code harder to audit for no good reason - also,
this will help with multipage bvecs later.

Signed-off-by: Kent Overstreet 
Cc: Jens Axboe 
Cc: Alexander Viro 
Cc: Chris Mason 
Cc: Jaegeuk Kim 
Cc: Joern Engel 
Cc: Prasad Joshi 
Cc: Trond Myklebust

NFS: Enabling v4.2 should not recompile nfsd and lockd

2013-11-19T21:20:40+00:00

When CONFIG_NFS_V4_2 is toggled nfsd and lockd will be recompiled,
instead of only the nfs client.  This patch moves a small amount of code
into the client directory to avoid unnecessary recompiles.

Signed-off-by: Anna Schumaker 
Signed-off-by: Trond Myklebust