From: Nathan Scott <nathans@sgi.com>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: Andreas Gruenbacher <agruen@suse.de>,
"Theodore Ts'o" <tytso@mit.edu>,
Dave Kleikamp <shaggy@austin.ibm.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/2][RESEND] Applying the umask in the VFS optionally
Date: Sun, 13 Oct 2002 12:17:19 +1000 [thread overview]
Message-ID: <20021013121719.A276740@wobbly.melbourne.sgi.com> (raw)
Hi Linus,
Here's a patch based on Andreas' recent mail describing a stumbling
block in the VFS which prevents filesystems that wish to implement
POSIX ACLs from doing so. Details here:
http://marc.theaimsgroup.com/?l=linux-kernel&m=102831541509385&w=2
cheers.
--
Nathan
fs/namei.c | 13 ++++++++-----
include/linux/fs.h | 2 ++
2 files changed, 10 insertions(+), 5 deletions(-)
diff -Naur linux-2.5.42-pristine/fs/namei.c linux-2.5.42-posixacl/fs/namei.c
--- linux-2.5.42-pristine/fs/namei.c Sat Oct 12 14:21:39 2002
+++ linux-2.5.42-posixacl/fs/namei.c Sun Oct 13 11:03:55 2002
@@ -1279,8 +1279,9 @@
/* Negative dentry, just create the file */
if (!dentry->d_inode) {
- error = vfs_create(dir->d_inode, dentry,
- mode & ~current->fs->umask);
+ if (!IS_POSIXACL(dir->d_inode))
+ mode &= ~current->fs->umask;
+ error = vfs_create(dir->d_inode, dentry, mode);
up(&dir->d_inode->i_sem);
dput(nd->dentry);
nd->dentry = dentry;
@@ -1442,7 +1443,8 @@
dentry = lookup_create(&nd, 0);
error = PTR_ERR(dentry);
- mode &= ~current->fs->umask;
+ if (!IS_POSIXACL(nd.dentry->d_inode))
+ mode &= ~current->fs->umask;
if (!IS_ERR(dentry)) {
switch (mode & S_IFMT) {
case 0: case S_IFREG:
@@ -1508,8 +1510,9 @@
dentry = lookup_create(&nd, 1);
error = PTR_ERR(dentry);
if (!IS_ERR(dentry)) {
- error = vfs_mkdir(nd.dentry->d_inode, dentry,
- mode & ~current->fs->umask);
+ if (!IS_POSIXACL(nd.dentry->d_inode))
+ mode &= ~current->fs->umask;
+ error = vfs_mkdir(nd.dentry->d_inode, dentry, mode);
dput(dentry);
}
up(&nd.dentry->d_inode->i_sem);
diff -Naur linux-2.5.42-pristine/include/linux/fs.h linux-2.5.42-posixacl/include/linux/fs.h
--- linux-2.5.42-pristine/include/linux/fs.h Sat Oct 12 14:21:35 2002
+++ linux-2.5.42-posixacl/include/linux/fs.h Sun Oct 13 11:03:55 2002
@@ -110,6 +110,7 @@
#define MS_MOVE 8192
#define MS_REC 16384
#define MS_VERBOSE 32768
+#define MS_POSIXACL 65536 /* VFS does not apply the umask */
#define MS_ACTIVE (1<<30)
#define MS_NOUSER (1<<31)
@@ -164,6 +165,7 @@
#define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE)
#define IS_NOATIME(inode) (__IS_FLG(inode, MS_NOATIME) || ((inode)->i_flags & S_NOATIME))
#define IS_NODIRATIME(inode) __IS_FLG(inode, MS_NODIRATIME)
+#define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
next reply other threads:[~2002-10-13 2:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-10-13 2:17 Nathan Scott [this message]
-- strict thread matches above, loose matches on Subject: below --
2002-10-07 2:53 Nathan Scott
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=20021013121719.A276740@wobbly.melbourne.sgi.com \
--to=nathans@sgi.com \
--cc=agruen@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=shaggy@austin.ibm.com \
--cc=torvalds@transmeta.com \
--cc=tytso@mit.edu \
/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
all inboxes | Powered by JetHome®