Re: [PATCH 1/6] nfsd: Remove nfsfh.h dependency on sunrpc

[Boaz Harrosh <bharrosh@panasas.com>]

On 11/24/2009 12:17 AM, J. Bruce Fields wrote:
> On Mon, Nov 23, 2009 at 05:58:30PM +0200, Boaz Harrosh wrote:
>> linux/nfsd/nfsfh.h defines some low level types which
>> are needed by exportfs and though by filesystems.
>>
>> In the file, fh_lock() uses the sunrpc dprint facility which
>> might cause a dependency of exportfs (and filesystems) on
> 
> "might cause"?
> 
> Does mere inclusion of this .h (without referencing fh_lock_nested() or
> its callers) actually create a dependency?
> 
> --b.
> 

No, only if code actually uses fh_lock_nested it will cause a dependency.
Which is only used in fs/nfsd/...

But I would like to discourage nfsd/debug.h at this level.

Should I move fh_lock_nested() and it's siblings to the new private vfs.h header
you made, and get rid of it this way?

Boaz

>> sunrpc which is unwanted / unexpected.
>>
>> Remove the debug-print from fh_lock() and avoid this dependency.
>>
>> Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
>> ---
>>  include/linux/nfsd/nfsfh.h |    4 ----
>>  1 files changed, 0 insertions(+), 4 deletions(-)
>>
>> diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
>> index 8f641c9..2973e11 100644
>> --- a/include/linux/nfsd/nfsfh.h
>> +++ b/include/linux/nfsd/nfsfh.h
>> @@ -20,7 +20,6 @@
>>  # include <linux/fs.h>
>>  #endif
>>  #include <linux/nfsd/const.h>
>> -#include <linux/nfsd/debug.h>
>>  
>>  /*
>>   * This is the old "dentry style" Linux NFSv2 file handle.
>> @@ -329,9 +328,6 @@ fh_lock_nested(struct svc_fh *fhp, unsigned int subclass)
>>  	struct dentry	*dentry = fhp->fh_dentry;
>>  	struct inode	*inode;
>>  
>> -	dfprintk(FILEOP, "nfsd: fh_lock(%s) locked = %d\n",
>> -			SVCFH_fmt(fhp), fhp->fh_locked);
>> -
>>  	BUG_ON(!dentry);
>>  
>>  	if (fhp->fh_locked) {
>> -- 
>> 1.6.5.2
>>