All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff Layton <jlayton@redhat.com>
To: trond.myklebust@primarydata.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH 3/9] nfs: check for POSIX lock capability on server even for flock locks
Date: Tue,  6 Sep 2016 11:12:34 -0400	[thread overview]
Message-ID: <1473174760-29859-4-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1473174760-29859-1-git-send-email-jlayton@redhat.com>

We may end up in here with a FL_FLOCK lock request. We translate
those to POSIX locks on the server, so we need to verify that the
server supports them no matter what sort of lock request this is.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 fs/nfs/nfs4proc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 85817e4103ea..e3bf95369daf 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -6135,8 +6135,7 @@ static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock
 	unsigned char fl_flags = request->fl_flags;
 	int status = -ENOLCK;
 
-	if ((fl_flags & FL_POSIX) &&
-			!test_bit(NFS_STATE_POSIX_LOCKS, &state->flags))
+	if (!test_bit(NFS_STATE_POSIX_LOCKS, &state->flags))
 		goto out;
 	/* Is this a delegated open? */
 	status = nfs4_set_lock_state(state, request);
-- 
2.7.4


  parent reply	other threads:[~2016-09-06 15:12 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-06 15:12 [PATCH 0/9] nfs: add CB_NOTIFY_LOCK support to nfs client Jeff Layton
2016-09-06 15:12 ` [PATCH 1/9] nfs: the length argument to read_buf should be unsigned Jeff Layton
2016-09-08 17:39   ` Anna Schumaker
2016-09-08 18:19     ` Jeff Layton
2016-09-06 15:12 ` [PATCH 2/9] nfs: eliminate pointless and confusing do_vfs_lock wrappers Jeff Layton
2016-09-06 15:12 ` Jeff Layton [this message]
2016-09-06 15:12 ` [PATCH 4/9] nfs: add a freezable_schedule_timeout_unsafe() and use it when waiting to retry LOCK Jeff Layton
2016-09-06 16:39   ` Jeff Layton
2016-09-08 18:20   ` Anna Schumaker
2016-09-08 18:36     ` Jeff Layton
2016-09-06 15:12 ` [PATCH 5/9] nfs: add handling for CB_NOTIFY_LOCK in client Jeff Layton
2016-09-08 20:11   ` Anna Schumaker
2016-09-06 15:12 ` [PATCH 6/9] nfs: move nfs4_set_lock_state call into caller Jeff Layton
2016-09-08 19:47   ` Anna Schumaker
2016-09-08 21:41     ` Jeff Layton
2016-09-06 15:12 ` [PATCH 7/9] nfs: add code to allow client to wait on lock callbacks Jeff Layton
2016-09-08 19:59   ` Anna Schumaker
2016-09-08 21:42     ` Jeff Layton
2016-09-06 15:12 ` [PATCH 8/9] nfs: ensure that the filehandle in CB_NOTIFY_LOCK request matches the inode Jeff Layton
2016-09-08 20:07   ` Anna Schumaker
2016-09-08 21:43     ` Jeff Layton
2016-09-06 15:12 ` [PATCH 9/9] nfs: track whether server sets MAY_NOTIFY_LOCK flag Jeff Layton
2016-09-08 20:15   ` Anna Schumaker
2016-09-08 21:47     ` Jeff Layton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1473174760-29859-4-git-send-email-jlayton@redhat.com \
    --to=jlayton@redhat.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=trond.myklebust@primarydata.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.