diff options
Diffstat (limited to 'fs/lockd/svclock.c')
| -rw-r--r-- | fs/lockd/svclock.c | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index e9b85d8fd5fe..cb3658ab9b7a 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -470,8 +470,10 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,  	    struct nlm_host *host, struct nlm_lock *lock, int wait,  	    struct nlm_cookie *cookie, int reclaim)  { -	struct nlm_block	*block = NULL; +#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)  	struct inode		*inode = nlmsvc_file_inode(file); +#endif +	struct nlm_block	*block = NULL;  	int			error;  	int			mode;  	int			async_block = 0; @@ -484,7 +486,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,  				(long long)lock->fl.fl_end,  				wait); -	if (inode->i_sb->s_export_op->flags & EXPORT_OP_SYNC_LOCKS) { +	if (nlmsvc_file_file(file)->f_op->lock) {  		async_block = wait;  		wait = 0;  	} |