After merging a fix from Trond to the new readdir(plus) implementation
I've released the rebased tree, based on 2.6.37-rc1 and pulled Jim's
fix to bl_initialize_mountpoint (now bl_set_layoutdriver) also to pnfs-all-2.6.36.
Cumulative patches can be generated from
git://linux-nfs.org/~bhalevy/linux-pnfs.git
using
git diff v2.6.37-rc1 pnfs-all-2.6.37-rc1-2010-11-03
and
git diff v2.6.36 pnfs-all-2.6.36-2010-11-03
Or, they can be downloaded from the wiki at:
http://wiki.linux-nfs.org/wiki/index.php/PNFS_Development_Git_tree
Latest patches that went in since pnfs-all-2.6.36-2010-10-28:
nfs-upstream:
Trond Myklebust 5bb2ab8 NFS: Fix a couple of regressions in readdir.
pnfs-block:
Jim Rees 2f6f3c2 SQUASHME: pnfs-block: Return failure from bl_initialize_mountpoint
pnfs-all-2.6.36:
Jim Rees 065733b pnfs-block: Return failure from bl_initialize_mountpoint
The updated tree as of today includes Fred and Andy's latest
patchsets (listed in details below) and the reset rebased on top of it
and fixed up to used the new {setup,cleanup,encode}_layout{commit,return}
layout driver API.
Note that the tree is based off of Linus' current master branch,
0143832cc96d0bf78486297aad5c8fb2c2ead02a, and not on v2.6.37-rc1,
to include some UML goodies to be in v2.6.37-rc2.
I also swapped the order in the -all branch sequence and put the server
pnfs branches on top of the client's to reflect the actual submission order.
The most useful branches are
pnfs-submit, pnfs client only code.
pnfsd server only code
pnfsd-all client + server, files layout only
pnfs-all-latest everything, serialized.
Cumulative patches can be generated from
git://linux-nfs.org/~bhalevy/linux-pnfs.git
using
git diff 0143832cc96d0bf78486297aad5c8fb2c2ead02a pnfs-all-2.6.37-rc1-2010-11-15
Or, they can be downloaded from the wiki at:
http://wiki.linux-nfs.org/wiki/index.php/PNFS_Development_Git_tree
Latest patches that went in since pnfs-all-2.6.37-rc1-2010-11-03:
pnfs-submit:
Fred Isaman 9d324dc pnfs-submit: remove RPC_ASSASSINATED(task) checks
Fred Isaman 2cd4c0d pnfs-submit: remove unnecessary field lgp->status
Fred Isaman 3d82dc6 pnfs-submit: layoutreturn's rpc_call_op functions need to handle bulk returns
Fred Isaman c822486 pnfs-submit: argument to should_free_lseg changed from lseg to range
Fred Isaman 9c998fd pnfs-submit: change layout state seqlock to a spinlock
Andy Adamson 8273821 NFSv4.1: Callback share session between ops
Benny Halevy 6093e91 SQUASHME: pnfs-submit: fixups for nfsv4.1 callbacks
Fred Isaman 91d40b5 SQUASHME: allow cb_sequence changes to compile without v4.1
Fred Isaman 2e175be pnfs-submit: change pnfs_layout_segment refcounting from kref to atomic_t
Fred Isaman 140df06 pnfs-submit: Have LAYOUTGETS wait when lo->plh_block_lgets is set
Fred Isaman 1843f9a pnfs-submit: remove _pnfs_can_return_lseg call from pnfs_clear_lseg_list
Fred Isaman 14c8957 pnfs_submit: nfs4_layoutreturn_release should not reference results
Fred Isaman 66a8ede pnfs-submit: reorganize struct cb_layoutrecallargs
Fred Isaman fbb96a5 pnfs-submit: rename lo->state to lo->plh_flags
Fred Isaman 1a8937d pnfs-submit: change pnfs_layout_hdr refcount to atomic_t
Fred Isaman c3deb42 pnfs-submit: rewrite of layout state handling and cb_layoutrecall
Fred Isaman 80e8d48 pnfs-submit: increase number of outstanding CB_LAYOUTRECALLS we can handle
Andy Adamson 904c8f9 pnfs-submit: roc add layoutreturn op to close compound
Andy Adamson 4fda730 pnfs-submit refactor layoutcommit xdr structures
Andy Adamson 204d330 pnfs-submit refactor pnfs_layoutcommit_setup
Andy Adamson cdacedd pnfs_submit: roc add layoutcommit op to close compound
Fred Isaman 9f2a617 SQUASHME: make roc patches compile without v4.1
Andy Adamson ef8d437 pnfs-submit: set back channel highest slot used
Andy Adamson 61f6466 pnfs-submit: add back channel draining
Benny Halevy 9225185 SQUASHME: pnfs-submit: highest backchannel slot used for !CONFIG_NFS_V4_1
Benny Halevy b4b7f57 SQUASHME: pnfs-submit: encode layoutreturn on close before close
Benny Halevy 93b7bc6 pnfs-submit: handle NFS4ERR_DELEG_REVOKED for LAYOUTRETURN
pnfs-obj-all:
Boaz Harrosh 2f7be19 SQUASHME: pnfs-obj: bug in last conversion to embedded pnfs_layout_segment
Benny Halevy 872a119 SQUASHME: pnfs-obj: fixup encode_layoutcommit arguments
pnfs-block-all:
Benny Halevy 0ed6d4a SQUASHME: pnfs-block: fixup setup_layoutcommit arguments
Benny Halevy b1c1fa3 SQUASHME: pnfs-block: fixup cleanup_layoutcommit arguments
Benny Halevy cda0c74 SQUASHME: pnfs-block: fixup encode_layoutcommit arguments
The new tree structure is as follows:
master (v2.6.37-rc1+)
upstream
nfsd-upstream
nfsd41-all
nfs-upstream
nfs41-all
pnfsd-files
pnfsd
spnfs
spnfs-block
pnfsd-lexp
pnfs-submit
pnfs
pnfs-block
pnfsd-all
pnfs-obj-all
pnfs-exofs-all
pnfs-block-all
pnfsd-lexp-all
spnfs-all
spnfs-block-all
pnfs-all-latest
This is a minor update to the linux-pnfs tree.
Rebased over v2.6.37-rc3, and dropped old version of
Trond's patch 88ce1e4 NFS: Fix a couple of regressions in readdir.
in favor of the new version merged in v2.6.37-rc3.
On 2010-11-15 18:31, Benny Halevy wrote:
Cumulative patches can be generated from
git://linux-nfs.org/~bhalevy/linux-pnfs.git
using
git diff v2.6.37-rc3 pnfs-all-2.6.37-rc3-2010-11-23
Or, they can be downloaded from the wiki at:
http://wiki.linux-nfs.org/wiki/index.php/PNFS_Development_Git_tree
Latest patches that went in since pnfs-all-2.6.37-rc1-2010-11-03:
pnfs:
Benny Halevy f272cdf SQUASHME: pnfs: move synchronize_rcu out side of spin_lock
The pnfs-all-2.6.37 branch, based on v2.6.37, is tagged as pnfs-all-2.6.37-2011-01-06
Cumulative patches can be generated from
git://linux-nfs.org/~bhalevy/linux-pnfs.git
using
git diff v2.6.37 pnfs-all-2.6.37-2011-01-06
Or, they can be downloaded from the wiki at:
http://wiki.linux-nfs.org/wiki/index.php/PNFS_Development_Git_tree
Latest patches that went in since pnfs-all-2.6.37-rc3-2010-11-23:
Andy Adamson 8ec9cf0 NFS dont free shared socket on backchannel put xprt
Andy Adamson 1a50e87 NFS implement v4.0 callback_ident
Andy Adamson d54419f NFS associate sessionid with callback connection
Andy Adamson e036acb NFS reference nfs_client across cb_compound processing
Andy Adamson 75767b5 NFS RPC_AUTH_GSS unsupported on v4.1 back channel
Andy Adamson 1e55cfb NFS add session back channel draining
Andy Adamson c0f97fa NFS only set bc_xprt upon success
Andy Adamson f69846b NFS fix the setting of exchange id flag
Fred Isaman 419e6b8 pnfs-submit: wave2: rewrite validate_bitmap_values to obey spec
Fred Isaman a00d5cc pnfs-submit: wave2: NFS4ERR_RESOURCE is not a valid error for CB_LAYOUTRECALL
Fred Isaman 8978415 pnfs-submit: wave2: check that partial LAYOUTGET return is ignored
Fred Isaman 5d7c2c7 pnfs-submit: wave2: remove cl_layoutrecalls list
Fred Isaman 6b90058 pnfs-submit: wave2: change plh_outstanding to atomic_t
Fred Isaman 02731c2 pnfs-submit: wave2: change lseg->valid from bool to a bit flag
Fred Isaman d2a0ab1 pnfs-submit: wave2: Remove LAYOUTRETURN from return on close
Fred Isaman 25180ca pnfs-submit: wave2: remove all LAYOUTRETURN code
Fred Isaman c23f64a pnfs-submit: wave2: Revert "pnfs_submit: update nfs4_async_handle_error for data server"
Fred Isaman 70f4ea3 pnfs-submit: wave2: remove forgotten layoutreturn struct definitions
Fred Isaman b7ec707 pnfs-submit: wave2: Remove smp barrier in get_layout_hdr
Fred Isaman 2d87a2c pnfs-submit: wave2: make put_layout_hdr have args consistent with related functions
Fred Isaman 7264acc wave 2: restore removed comment in nfs4_evict_inode
Fred Isaman cfed8e0 wave 2: remove gratuitous changes to nfs4_layoutget_done
Fred Isaman 233ca9a wave 2: remove pnfs_ld_layoutret_on_setattr()
Fred Isaman 84446ae wave 2: share code between put_lseg and pnfs_free_lseg_list
Fred Isaman a851528 wave 2: remove notify_drained
Fred Isaman f38b63f wave 2: rename notify fields
Fred Isaman 3f937e3 wave 2: remove trigger_flush
Fred Isaman 99f81a6 wave 2: Fix outdated comment above _pnfs_return_layout
Fred Isaman c258f80 wave 2: remove unneeded include from pnfs.h
Fred Isaman 362dc1a wave 2: remove unneeded includes from callback_proc.c
Fred Isaman 94ee6f7 debug: add assert_spin_locked
Fred Isaman 012a2c7 pnfs-submit: wave4: fix bug dealing with commit split between DS and MDS
Fred Isaman 447d2e4 pnfs-submit: Turn off layoutcommits
Benny Halevy b53b08c Revert "pnfs-submit: wave2: remove forgotten layoutreturn struct definitions"
Benny Halevy 1896997 Revert "pnfs-submit: Turn off layoutcommits"
Benny Halevy 5d7a3fc Revert "pnfs-submit: wave2: remove all LAYOUTRETURN code"
Benny Halevy a534dcf Revert "pnfs-submit: wave2: Remove LAYOUTRETURN from return on close"
Benny Halevy 3c5e897 FIXME: roc should return layout on last close
Benny Halevy 751b783 Revert "pnfs-submit: wave2: remove cl_layoutrecalls list"
Benny Halevy ae5ccc3 Revert "pnfs-submit: wave2: Pull out all recall initiated LAYOUTRETURNS"
Benny Halevy 98dba28 Revert "pnfs-submit: wave2: Don't wait in layoutget"
Benny Halevy bd49095 Revert "pnfs-submit: wave2: check that partial LAYOUTGET return is ignored"
Benny Halevy 7893f29 SQUASHME: pnfs-obj: fixup layoutcommit methods args
Benny Halevy 7f5ffb4 SQUASHME: pnfs-block: fixup layoutcommit methods args