diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-13 15:22:02 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-13 15:22:02 -0400 |
| commit | e655f945cd7ba2a8360ddd5462ca535a3b41e07e (patch) | |
| tree | c4ea74ad13b1c0a1956bdcf507ef26de70f35511 /fs/nfs/internal.h | |
| parent | 00cfaa943ec30abbc7109b0b918e0b6a0eef07dc (diff) | |
| parent | f563b89b182594f827b4100bd34f916339785a77 (diff) | |
Merge branch 'bugfixes' into linux-next
* bugfixes:
NFS: Don't reset pg_moreio in __nfs_pageio_add_request
NFS: Remove 2 unused variables
nfs: handle multiple reqs in nfs_wb_page_cancel
nfs: handle multiple reqs in nfs_page_async_flush
nfs: change find_request to find_head_request
nfs: nfs_page should take a ref on the head req
nfs: mark nfs_page reqs with flag for extra ref
nfs: only show Posix ACLs in listxattr if actually present
Conflicts:
fs/nfs/write.c
Diffstat (limited to 'fs/nfs/internal.h')
| -rw-r--r-- | fs/nfs/internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index da36257628c5..2f19e8392eb3 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h | |||
| @@ -244,6 +244,7 @@ void nfs_pgio_data_destroy(struct nfs_pgio_header *); | |||
| 244 | int nfs_generic_pgio(struct nfs_pageio_descriptor *, struct nfs_pgio_header *); | 244 | int nfs_generic_pgio(struct nfs_pageio_descriptor *, struct nfs_pgio_header *); |
| 245 | int nfs_initiate_pgio(struct rpc_clnt *, struct nfs_pgio_header *, | 245 | int nfs_initiate_pgio(struct rpc_clnt *, struct nfs_pgio_header *, |
| 246 | const struct rpc_call_ops *, int, int); | 246 | const struct rpc_call_ops *, int, int); |
| 247 | void nfs_free_request(struct nfs_page *req); | ||
| 247 | 248 | ||
| 248 | static inline void nfs_iocounter_init(struct nfs_io_counter *c) | 249 | static inline void nfs_iocounter_init(struct nfs_io_counter *c) |
| 249 | { | 250 | { |