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

SUNRPC/NFS: make rpc pipe upcall generic

2011-11-11T17:43:03+00:00

commit c1225158a8dad9e9d5eee8a17dbbd9c7cda05ab9 upstream.

The same function is used by idmap, gss and blocklayout code. Make it
generic.

Signed-off-by: Peng Tao 
Signed-off-by: Jim Rees 
Signed-off-by: Trond Myklebust 
Signed-off-by: Greg Kroah-Hartman

pnfsblock: fix writeback deadlock

2011-11-11T17:43:00+00:00

commit 7542274519b3ba87555410c66e8356ac1e3bc9b3 upstream.

We should check if the sector is already initialized before
trying to grab the page from page cache. Otherwise when two
pages of the same block are written back by two threads each
calling from writepage_locked, it can cause deadlock like bellow.

 [ 1080.972099] INFO: task kswapd0:25 blocked for more than 120 seconds.
 [ 1080.972377] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
 [ 1080.972812] kswapd0         D ffff88000c4926c0     0    25      2 0x00000000
 [ 1080.972816]  ffff88000df276b0 0000000000000046 ffff88000df27640 ffffffff81013ba7
 [ 1080.972821]  ffff88000c492310 ffff88000df27fd8 ffff88000df27fd8 00000000001d3440
 [ 1080.972824]  ffff88000c378000 ffff88000c492310 ffff8800175d3d40 ffff880017fc75a8
 [ 1080.972828] Call Trace:
 [ 1080.972860]  [] ? read_tsc+0x9/0x19
 [ 1080.972877]  [] ? lock_page+0x2b/0x2b
 [ 1080.972899]  [] io_schedule+0x63/0x7e
 [ 1080.972902]  [] sleep_on_page+0xe/0x12
 [ 1080.972905]  [] __wait_on_bit_lock+0x46/0x8f
 [ 1080.972916]  [] ? lock_release_holdtime.part.7+0x6b/0x72
 [ 1080.972919]  [] __lock_page+0x66/0x68
 [ 1080.972928]  [] ? autoremove_wake_function+0x3d/0x3d
 [ 1080.972932]  [] lock_page+0x27/0x2b
 [ 1080.972934]  [] find_lock_page+0x34/0x57
 [ 1080.972937]  [] find_or_create_page+0x34/0x8a
 [ 1080.972947]  [] bl_write_pagelist+0x205/0x6da [blocklayoutdriver]
 [ 1080.972951]  [] ? bl_free_lseg+0x38/0x38 [blocklayoutdriver]
 [ 1080.972995]  [] ? nfs_write_rpcsetup+0x118/0x123 [nfs]
 [ 1080.973033]  [] pnfs_generic_pg_writepages+0x10b/0x1f4 [nfs]
 [ 1080.973089]  [] nfs_pageio_doio+0x1a/0x43 [nfs]
 [ 1080.973098]  [] nfs_pageio_complete+0x16/0x2d [nfs]
 [ 1080.973108]  [] nfs_writepage_locked+0xa0/0xbf [nfs]
 [ 1080.973119]  [] nfs_writepage+0x16/0x2b [nfs]
 [ 1080.973122]  [] ? clear_page_dirty_for_io+0x87/0x9a
 [ 1080.973133]  [] shrink_page_list+0x39b/0x6c8
 [ 1080.973139]  [] shrink_inactive_list+0x22c/0x39e
 [ 1080.973144]  [] ? lock_release_holdtime.part.7+0x6b/0x72
 [ 1080.973148]  [] shrink_zone+0x445/0x588
 [ 1080.973152]  [] balance_pgdat+0x2c2/0x56b
 [ 1080.973170]  [] ? __bitmap_weight+0x34/0x80
 [ 1080.973175]  [] kswapd+0x2be/0x2fa
 [ 1080.973179]  [] ? __init_waitqueue_head+0x4b/0x4b
 [ 1080.973183]  [] ? balance_pgdat+0x56b/0x56b
 [ 1080.973187]  [] kthread+0xa8/0xb0
 [ 1080.973200]  [] kernel_thread_helper+0x4/0x10
 [ 1080.973205]  [] ? __init_kthread_worker+0x5a/0x5a
 [ 1080.973210]  [] ? gs_change+0x13/0x13
 [ 1080.973213] no locks held by kswapd0/25.

Signed-off-by: Peng Tao 
Signed-off-by: Jim Rees 
Signed-off-by: Trond Myklebust 
Signed-off-by: Greg Kroah-Hartman

pnfsblock: fix NULL pointer dereference

2011-11-11T17:42:59+00:00

commit e6d05a757c314ad88d0649d3835a8a1daa964236 upstream.

bl_add_page_to_bio returns error pointer. bio should be reset to
NULL in failure cases as the out path always calls bl_submit_bio.

Signed-off-by: Peng Tao 
Signed-off-by: Jim Rees 
Signed-off-by: Trond Myklebust 
Signed-off-by: Greg Kroah-Hartman

pnfs: make _set_lo_fail generic

2011-11-11T17:42:57+00:00

commit 1b0ae068779874f54b55aac3a2a992bcf3f2c3c4 upstream.

file layout and block layout both use it to set mark layout io failure
bit. So make it generic.

Signed-off-by: Peng Tao 
Signed-off-by: Jim Rees 
Signed-off-by: Trond Myklebust 
Signed-off-by: Greg Kroah-Hartman

pnfsblock: add missing rpc_put_mount and path_put

2011-11-11T17:42:56+00:00

commit 760383f1ee4d14b0e0bdf0cddee648d9b8633429 upstream.

Reviewed-by: Jeff Layton 
Signed-off-by: Peng Tao 
Signed-off-by: Jim Rees 
Signed-off-by: Trond Myklebust 
Signed-off-by: Greg Kroah-Hartman

pnfsblock: fix size of upcall message

2011-11-11T17:42:55+00:00

commit fdc17abbc4b6094b34ee8ff5d91eaba8637594a2 upstream.

Make the status field explicitly 32 bits.  "...it's unlikely that the kernel
and userspace would differ on the size of an int here, but it might be a
good idea to go ahead and make that explicitly 32 bits in case we end up
dealing with more exotic arches at some point in the future."

Suggested-by: Jeff Layton 
Signed-off-by: Jim Rees 
Signed-off-by: Benny Halevy 
Signed-off-by: Trond Myklebust 
Signed-off-by: Greg Kroah-Hartman

pnfsblock: fix return code confusion

2011-11-11T17:42:55+00:00

commit 516f2e24faa7548a61d9ba790958528469c2e284 upstream.

Always return PTR_ERR, not NULL, from nfs4_blk_get_deviceinfo and
nfs4_blk_decode_device.

Check for IS_ERR, not NULL, in bl_set_layoutdriver when calling
nfs4_blk_get_deviceinfo.

Signed-off-by: Jim Rees 
Signed-off-by: Benny Halevy 
Signed-off-by: Trond Myklebust 
Signed-off-by: Greg Kroah-Hartman

nfs: add missing prefetch.h include

2011-08-04T15:54:25+00:00

Fix this compile error on s390:

  CC [M]  fs/nfs/blocklayout/blocklayout.o
fs/nfs/blocklayout/blocklayout.c: In function 'bl_end_io_read':
fs/nfs/blocklayout/blocklayout.c:201:4: error: implicit declaration of function 'prefetchw'

Introduced with 9549ec01 "pnfsblock: bl_read_pagelist".

Cc: Fred Isaman 
Signed-off-by: Heiko Carstens 
Signed-off-by: Trond Myklebust

pnfsblock: write_pagelist handle zero invalid extents

2011-07-31T16:18:17+00:00

For invalid extents, find other pages in the same fsblock and write them out.

[pnfsblock: write_begin]
Signed-off-by: Fred Isaman 
Signed-off-by: Benny Halevy 
Signed-off-by: Benny Halevy 
Signed-off-by: Peng Tao 
Signed-off-by: Jim Rees 
Signed-off-by: Trond Myklebust

pnfsblock: note written INVAL areas for layoutcommit

2011-07-31T16:18:17+00:00

Signed-off-by: Peng Tao 
Signed-off-by: Fred Isaman 
Signed-off-by: Benny Halevy 
Signed-off-by: Benny Halevy 
Signed-off-by: Jim Rees 
Signed-off-by: Trond Myklebust