git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
[pandora-kernel.git]
/
include
/
linux
/
nfs_fs_sb.h
diff --git
a/include/linux/nfs_fs_sb.h
b/include/linux/nfs_fs_sb.h
index
50a661f
..
b5479df
100644
(file)
--- a/
include/linux/nfs_fs_sb.h
+++ b/
include/linux/nfs_fs_sb.h
@@
-131,8
+131,9
@@
struct nfs_server {
struct fscache_cookie *fscache; /* superblock cookie */
#endif
struct fscache_cookie *fscache; /* superblock cookie */
#endif
+ u32 pnfs_blksize; /* layout_blksize attr */
#ifdef CONFIG_NFS_V4
#ifdef CONFIG_NFS_V4
- u32 attr_bitmask[
2
];/* V4 bitmask representing the set
+ u32 attr_bitmask[
3
];/* V4 bitmask representing the set
of attributes supported on this
filesystem */
u32 cache_consistency_bitmask[2];
of attributes supported on this
filesystem */
u32 cache_consistency_bitmask[2];
@@
-145,6
+146,7
@@
struct nfs_server {
filesystem */
struct pnfs_layoutdriver_type *pnfs_curr_ld; /* Active layout driver */
struct rpc_wait_queue roc_rpcwaitq;
filesystem */
struct pnfs_layoutdriver_type *pnfs_curr_ld; /* Active layout driver */
struct rpc_wait_queue roc_rpcwaitq;
+ void *pnfs_ld_data; /* per mount point data */
/* the following fields are protected by nfs_client->cl_lock */
struct rb_root state_owners;
/* the following fields are protected by nfs_client->cl_lock */
struct rb_root state_owners;