From a37aa8505719b3b1439a217e96ad941c7462b17a Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Sun, 31 Jul 2011 16:39:04 -0400 Subject: [PATCH] --- yaml --- r: 261838 b: refs/heads/master c: a00ed25cce6fe856388f89c7cd40da0eee7666a6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/pnfs.h | 2 +- trunk/include/linux/nfs_fs_sb.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9261e8aa413d..b150da6e9709 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24c3047095fa3954f114bfff2e37b8fcbb216396 +refs/heads/master: a00ed25cce6fe856388f89c7cd40da0eee7666a6 diff --git a/trunk/fs/nfs/pnfs.h b/trunk/fs/nfs/pnfs.h index e0b5d80a43f6..01cbfd54f3cb 100644 --- a/trunk/fs/nfs/pnfs.h +++ b/trunk/fs/nfs/pnfs.h @@ -380,7 +380,7 @@ pnfs_roc_drain(struct inode *ino, u32 *barrier) } static inline void set_pnfs_layoutdriver(struct nfs_server *s, - const struct nfs_fh *mntfh, u32 id); + const struct nfs_fh *mntfh, u32 id) { } diff --git a/trunk/include/linux/nfs_fs_sb.h b/trunk/include/linux/nfs_fs_sb.h index 82fdfc7987d6..b5479df8378d 100644 --- a/trunk/include/linux/nfs_fs_sb.h +++ b/trunk/include/linux/nfs_fs_sb.h @@ -131,6 +131,7 @@ struct nfs_server { struct fscache_cookie *fscache; /* superblock cookie */ #endif + u32 pnfs_blksize; /* layout_blksize attr */ #ifdef CONFIG_NFS_V4 u32 attr_bitmask[3];/* V4 bitmask representing the set of attributes supported on this @@ -145,7 +146,6 @@ struct nfs_server { filesystem */ struct pnfs_layoutdriver_type *pnfs_curr_ld; /* Active layout driver */ struct rpc_wait_queue roc_rpcwaitq; - u32 pnfs_blksize; /* layout_blksize attr */ void *pnfs_ld_data; /* per mount point data */ /* the following fields are protected by nfs_client->cl_lock */