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 /tools/perf/scripts/python/syscall-counts.py | |
| parent | replace strict_strto calls (diff) | |
| parent | NFS: Don't reset pg_moreio in __nfs_pageio_add_request (diff) | |
| download | linux-dev-e655f945cd7ba2a8360ddd5462ca535a3b41e07e.tar.xz linux-dev-e655f945cd7ba2a8360ddd5462ca535a3b41e07e.zip | |
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 '')
0 files changed, 0 insertions, 0 deletions