On Wed, Dec 7, 2011 at 6:46 PM, Olga Kornievskaia <aglo@xxxxxxxxxxxxxx> wrote:
> On Wed, Dec 7, 2011 at 9:05 AM, Benny Halevy <bhalevy@xxxxxxxxxx> wrote:
>> On 2011-12-06 22:57, Olga Kornievskaia wrote:
>>> Latest pnfs-all-latest (commit
>>> 58deb32bd36e92f5f44ac6d5e5ab3c36732c4ebd) doesn't compile if
>>> CONFIG_PNFSD_BLOCK is not enabled.
>>>
>>> 1st compile error is in (and probably gcc version dependent):
>>> CC [M] fs/nfsd/nfsctl.o
>>> In file included from fs/nfsd/nfsctl.c:18:0:
>>> include/linux/nfsd/nfsd4_block.h: In function ‘pnfs_block_enabled’:
>>> include/linux/nfsd/nfsd4_block.h:104:46: error: parameter name omitted
>>> include/linux/nfsd/nfsd4_block.h:104:46: error: parameter name omitted
>>
>> Sorry. The patch in reply to this message should fix that.
>>
>> Benny
>>
>> diff --git a/fs/nfsd/nfsd4_block.h b/fs/nfsd/nfsd4_block.h
>> index 9c2941f..4ce5755 100644
>> --- a/fs/nfsd/nfsd4_block.h
>> +++ b/fs/nfsd/nfsd4_block.h
>> @@ -100,7 +100,7 @@ int bl_layoutreturn(struct inode *,
>>
>> #else
>>
>> -static inline bool pnfs_block_enabled(struct inode *, int) { return false; }
>> +static inline bool pnfs_block_enabled(struct inode *i, int ex_flags) { return false; }
>> static inline void nfsd_bl_init(void) {}
>>
>> #endif /* CONFIG_PNFSD_BLOCK */
>>
>
> Sure that fixes problem #1. 2 more to go.
Sorry, bad git pull. I see that you moved things around. I can confirm
that all compiles correctly.
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
