Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34

This commit is contained in:
Trond Myklebust
2010-03-05 15:46:18 -05:00
5508 changed files with 337646 additions and 139163 deletions

View File

@@ -105,7 +105,7 @@ struct nfs_server {
struct rpc_clnt * client; /* RPC client handle */
struct rpc_clnt * client_acl; /* ACL RPC client handle */
struct nlm_host *nlm_host; /* NLM client handle */
struct nfs_iostats * io_stats; /* I/O statistics */
struct nfs_iostats __percpu *io_stats; /* I/O statistics */
struct backing_dev_info backing_dev_info;
atomic_long_t writeback; /* number of writeback pages */
int flags; /* various flags */