]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
nfs: merge nfs_pgio_data into _header
authorWeston Andros Adamson <dros@primarydata.com>
Mon, 15 Sep 2014 18:14:34 +0000 (14:14 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 5 Oct 2014 20:41:00 +0000 (13:41 -0700)
commit46af9f153348a5fd7170059b1eeb52d64149ab9b
tree7086b4541ebd58fd886421c7abd8eef80f8ebaa5
parentb65c35eca4b887e5977bc49a839a8c3bcb276fe5
nfs: merge nfs_pgio_data into _header

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 <hch@lst.de>
Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
19 files changed:
fs/nfs/blocklayout/blocklayout.c
fs/nfs/direct.c
fs/nfs/filelayout/filelayout.c
fs/nfs/internal.h
fs/nfs/nfs3proc.c
fs/nfs/nfs4_fs.h
fs/nfs/nfs4proc.c
fs/nfs/nfs4trace.h
fs/nfs/objlayout/objio_osd.c
fs/nfs/objlayout/objlayout.c
fs/nfs/objlayout/objlayout.h
fs/nfs/pagelist.c
fs/nfs/pnfs.c
fs/nfs/pnfs.h
fs/nfs/proc.c
fs/nfs/read.c
fs/nfs/write.c
include/linux/nfs_page.h
include/linux/nfs_xdr.h