From: Jeff Layton <jlayton@redhat.com>
To: trond.myklebust@primarydata.com, Anna.Schumaker@netapp.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH v2 03/10] nfs: check for POSIX lock capability on server even for flock locks
Date: Fri, 9 Sep 2016 14:47:44 -0400 [thread overview]
Message-ID: <1473446870-1831-4-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1473446870-1831-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
next prev parent reply other threads:[~2016-09-09 18:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-09 18:47 [PATCH v2 00/10] nfs: add CB_NOTIFY_LOCK support to nfs client Jeff Layton
2016-09-09 18:47 ` [PATCH v2 01/10] nfs: the length argument to read_buf should be unsigned Jeff Layton
2016-09-09 18:47 ` [PATCH v2 02/10] nfs: eliminate pointless and confusing do_vfs_lock wrappers Jeff Layton
2016-09-09 18:47 ` Jeff Layton [this message]
2016-09-09 18:47 ` [PATCH v2 04/10] nfs: use safe, interruptible sleeps when waiting to retry LOCK Jeff Layton
2016-09-09 18:47 ` [PATCH v2 05/10] nfs: track whether server sets MAY_NOTIFY_LOCK flag Jeff Layton
2016-09-12 20:19 ` Anna Schumaker
2016-09-12 20:30 ` Jeff Layton
2016-09-12 20:38 ` Anna Schumaker
2016-09-09 18:47 ` [PATCH v2 06/10] nfs: add handling for CB_NOTIFY_LOCK in client Jeff Layton
2016-09-09 18:47 ` [PATCH v2 07/10] nfs: move nfs4_set_lock_state call into caller Jeff Layton
2016-09-09 18:47 ` [PATCH v2 08/10] nfs: move nfs4 lock retry attempt loop to a separate function Jeff Layton
2016-09-09 18:47 ` [PATCH v2 09/10] nfs: add code to allow client to wait on lock callbacks Jeff Layton
2016-09-09 18:48 ` [PATCH v2 10/10] nfs: ensure that the filehandle in CB_NOTIFY_LOCK request matches the inode 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=1473446870-1831-4-git-send-email-jlayton@redhat.com \
--to=jlayton@redhat.com \
--cc=Anna.Schumaker@netapp.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).