Please pull NFS client changes

Commit Message

Trond Myklebust July 31, 2011, 7:39 p.m. UTC

On Sun, 2011-07-31 at 21:14 +0200, Jens Axboe wrote: 
> On 2011-07-31 20:24, Christoph Hellwig wrote:
> > How does this manage to include the pnfs block code, which only was posted
> > on the list a few hours before the pull request, and which doesn't
> > appear to past testing very well (although the major issue seems to be
> > core nfs code)?
> 
> And it doesn't even compile:
> 
> In file included from fs/nfs/client.c:51:0:
> fs/nfs/pnfs.h:384:1: error: expected identifier or ‘(’ before ‘{’ token
> fs/nfs/client.c: In function ‘nfs_server_set_fsinfo’:
> fs/nfs/client.c:939:8: error: ‘struct nfs_server’ has no member named
> ‘pnfs_blksize’
> fs/nfs/client.c: At top level:
> fs/nfs/pnfs.h:382:20: warning: ‘set_pnfs_layoutdriver’ used but never
> defined [enabled by default]
> make[2]: *** [fs/nfs/client.o] Error 1

Sigh. This should fix it...
8<------------------------------------------------------------------------------------- 
From b74e1d98b2027aa3ec46f3612143d0d35db92cf5 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <[e-mail]>
Date: Sun, 31 Jul 2011 15:33:26 -0400
Subject: [PATCH] NFS: Fix a typo in fs/nfs/pnfs.h

Reported-by: Jens Axboe <[e-mail]>
Signed-off-by: Trond Myklebust <[e-mail]>
---
 fs/nfs/pnfs.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Jens Axboe July 31, 2011, 7:46 p.m. UTC | #1

On 2011-07-31 21:39, Trond Myklebust wrote:
> On Sun, 2011-07-31 at 21:14 +0200, Jens Axboe wrote: 
>> On 2011-07-31 20:24, Christoph Hellwig wrote:
>>> How does this manage to include the pnfs block code, which only was posted
>>> on the list a few hours before the pull request, and which doesn't
>>> appear to past testing very well (although the major issue seems to be
>>> core nfs code)?
>>
>> And it doesn't even compile:
>>
>> In file included from fs/nfs/client.c:51:0:
>> fs/nfs/pnfs.h:384:1: error: expected identifier or ‘(’ before ‘{’ token
>> fs/nfs/client.c: In function ‘nfs_server_set_fsinfo’:
>> fs/nfs/client.c:939:8: error: ‘struct nfs_server’ has no member named
>> ‘pnfs_blksize’
>> fs/nfs/client.c: At top level:
>> fs/nfs/pnfs.h:382:20: warning: ‘set_pnfs_layoutdriver’ used but never
>> defined [enabled by default]
>> make[2]: *** [fs/nfs/client.o] Error 1
> 
> Sigh. This should fix it...

Only the first one, there are two independent places it broke. You
missed this bit:

fs/nfs/client.c:939:8: error: ‘struct nfs_server’ has no member named

Patch

diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index e0b5d80..01cbfd5 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)
 {
 }