From: Pavel Shilovsky <piastry@etersoft.ru>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, linux-cifs@vger.kernel.org,
linux-nfs@vger.kernel.org, wine-devel@winehq.org
Subject: [PATCH v7 3/7] locks: Disable LOCK_MAND support for MS_SHARELOCK mounts
Date: Fri, 17 Jan 2014 14:07:08 +0400 [thread overview]
Message-ID: <1389953232-9428-4-git-send-email-piastry@etersoft.ru> (raw)
In-Reply-To: <1389953232-9428-1-git-send-email-piastry@etersoft.ru>
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
---
fs/locks.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/fs/locks.c b/fs/locks.c
index 7ecc511..c7e780a 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1904,6 +1904,12 @@ SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int, cmd)
goto out;
}
+ /* Disable LOCK_MAND support for FS mounted with MS_SHARELOCK */
+ if ((cmd & LOCK_MAND) && IS_SHARELOCK(f.file->f_path.dentry->d_inode)) {
+ error = -EPERM;
+ goto out;
+ }
+
can_sleep = !(cmd & LOCK_NB);
cmd &= ~LOCK_NB;
unlock = (cmd == LOCK_UN);
--
1.7.10.4
next prev parent reply other threads:[~2014-01-17 10:07 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-17 10:07 [PATCH v7 0/7] Add O_DENY* support for VFS and CIFS/NFS Pavel Shilovsky
2014-01-17 10:07 ` [PATCH v7 1/7] VFS: Introduce new O_DENY* open flags Pavel Shilovsky
[not found] ` <1389953232-9428-2-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
2014-01-17 18:18 ` One Thousand Gnomes
[not found] ` <20140117181847.6c1f3831-mUKnrFFms3BCCTY1wZZT65JpZx93mCW/@public.gmane.org>
2014-01-20 10:45 ` Pavel Shilovsky
[not found] ` <CAKywueT=JsTkNC+w-vrN0ftam7F8Eqb8DXJ0w2G4q9vnt0hVNQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-01-20 13:34 ` One Thousand Gnomes
[not found] ` <20140120133424.09328108-mUKnrFFms3BCCTY1wZZT65JpZx93mCW/@public.gmane.org>
2014-01-21 13:19 ` Pavel Shilovsky
2014-02-01 13:57 ` Jeff Layton
2014-02-01 13:20 ` Jeff Layton
[not found] ` <20140201082020.117bf3b3-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2014-02-04 12:03 ` Pavel Shilovsky
[not found] ` <CAKywueTAvxVV4+h3Vf3XLE+KnpPh_9zRGkHChTUR8x=i8zfDTw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-02-04 12:21 ` Jeff Layton
2014-01-17 10:07 ` Pavel Shilovsky [this message]
2014-01-17 10:07 ` [PATCH v7 4/7] CIFS: Add O_DENY* open flags support Pavel Shilovsky
2014-01-17 10:07 ` [PATCH v7 5/7] NFSD: Pass share reservations flags to VFS Pavel Shilovsky
2014-01-17 10:07 ` [PATCH v7 6/7] NFSv4: Add deny state handling for nfs4_state struct Pavel Shilovsky
2014-01-17 10:07 ` [PATCH v7 7/7] NFSv4: Add O_DENY* open flags support Pavel Shilovsky
2014-01-17 18:43 ` [PATCH v7 0/7] Add O_DENY* support for VFS and CIFS/NFS Frank Filz
2014-01-20 9:56 ` Pavel Shilovsky
[not found] ` <CAKywueTOi-WPpgH7x3VK7EkGJXE8fHUqcLgSUm6o6UA+uaQtjA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-01-27 19:49 ` Frank Filz
[not found] ` <1389953232-9428-1-git-send-email-piastry-7qunaywFIewox3rIn2DAYQ@public.gmane.org>
2014-01-17 10:07 ` [PATCH v7 2/7] VFS: Add O_DENYDELETE support for VFS Pavel Shilovsky
2014-01-20 8:14 ` [PATCH v7 0/7] Add O_DENY* support for VFS and CIFS/NFS Volker Lendecke
2014-01-20 10:20 ` Pavel Shilovsky
[not found] ` <CAKywueQwfFASPpevO8Z-_xwZqRjkzfkOceQJDya8D7FDW+UmMg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-01-20 10:31 ` Volker Lendecke
[not found] ` <E1W5C8U-000ozD-Ku-dqLtpHMqGvUyWpdLl23E4A@public.gmane.org>
2014-01-21 13:31 ` Pavel Shilovsky
[not found] ` <CAKywueQng9=u1YYwkYGCunWW8RBhARhJjEhBcoA6CKF6TrKSBg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-01-21 14:17 ` Volker Lendecke
2014-01-31 15:51 ` Pavel Shilovsky
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=1389953232-9428-4-git-send-email-piastry@etersoft.ru \
--to=piastry@etersoft.ru \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=wine-devel@winehq.org \
/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).