2 files changed, 2 insertions, 2 deletions

diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index e0b5d80a43f..01cbfd54f3c 100644
--- a/fs/nfs/pnfs.h
+++ b/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/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 82fdfc7987d..b5479df8378 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/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 */