From: Miklos Szeredi <miklos@szeredi.hu>
To: akpm@linux-foundation.org
Cc: hch@infradead.org, viro@ZenIV.linux.org.uk,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [patch 10/24] vfs: truncate: append-only checking cleanup
Date: Tue, 06 May 2008 11:13:37 +0200 [thread overview]
Message-ID: <20080506091418.842237934@szeredi.hu> (raw)
In-Reply-To: 20080506091327.259950960@szeredi.hu
[-- Attachment #1: truncate_append_cleanup.patch --]
[-- Type: text/plain, Size: 2245 bytes --]
From: Miklos Szeredi <mszeredi@suse.cz>
Move the append-only checks from truncate to notify_change(). Checks
for append-only files are always performed by the VFS and not by the
filesystem so this belongs in notify_change(), and not in
inode_change_ok().
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---
fs/attr.c | 6 ++++++
fs/namei.c | 2 --
fs/open.c | 8 --------
3 files changed, 6 insertions(+), 10 deletions(-)
Index: linux-2.6/fs/open.c
===================================================================
--- linux-2.6.orig/fs/open.c 2008-05-06 11:04:35.000000000 +0200
+++ linux-2.6/fs/open.c 2008-05-06 11:04:36.000000000 +0200
@@ -253,10 +253,6 @@ static long do_sys_truncate(const char _
if (error)
goto mnt_drop_write_and_out;
- error = -EPERM;
- if (IS_APPEND(inode))
- goto mnt_drop_write_and_out;
-
error = get_write_access(inode);
if (error)
goto mnt_drop_write_and_out;
@@ -321,10 +317,6 @@ static long do_sys_ftruncate(unsigned in
if (small && length > MAX_NON_LFS)
goto out_putf;
- error = -EPERM;
- if (IS_APPEND(inode))
- goto out_putf;
-
error = locks_verify_truncate(inode, file, length);
if (!error)
error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, file);
Index: linux-2.6/fs/attr.c
===================================================================
--- linux-2.6.orig/fs/attr.c 2008-05-06 11:04:35.000000000 +0200
+++ linux-2.6/fs/attr.c 2008-05-06 11:04:36.000000000 +0200
@@ -114,6 +114,12 @@ int notify_change(struct dentry * dentry
return -EPERM;
}
+ /*
+ * IS_IMMUTABLE() is checked by caller for truncation
+ */
+ if ((ia_valid & ATTR_SIZE) && IS_APPEND(inode))
+ return -EPERM;
+
now = current_fs_time(inode->i_sb);
attr->ia_ctime = now;
Index: linux-2.6/fs/namei.c
===================================================================
--- linux-2.6.orig/fs/namei.c 2008-05-06 11:04:29.000000000 +0200
+++ linux-2.6/fs/namei.c 2008-05-06 11:04:36.000000000 +0200
@@ -1639,8 +1639,6 @@ int may_open(struct nameidata *nd, int a
if (IS_APPEND(inode)) {
if ((flag & FMODE_WRITE) && !(flag & O_APPEND))
return -EPERM;
- if (flag & O_TRUNC)
- return -EPERM;
}
/* O_NOATIME can only be set by the owner or superuser */
--
next prev parent reply other threads:[~2008-05-06 9:19 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-06 9:13 [patch 00/24] vfs: fixes and cleanups + add helpers to check r/o bind mounts Miklos Szeredi
2008-05-06 9:13 ` [patch 01/24] nfsd: clean up mnt_want_write calls Miklos Szeredi
2008-05-06 9:13 ` [patch 02/24] cgroup: dont call vfs_mkdir Miklos Szeredi
2008-05-06 9:13 ` [patch 03/24] reiserfs: dont call vfs_rmdir Miklos Szeredi
2008-05-06 9:13 ` [patch 04/24] reiserfs: dont call notify_change Miklos Szeredi
2008-05-08 16:49 ` Christoph Hellwig
2008-05-06 9:13 ` [patch 05/24] sysfs: " Miklos Szeredi
2008-05-08 16:50 ` Christoph Hellwig
2008-05-06 9:13 ` [patch 06/24] hpfs: " Miklos Szeredi
2008-05-08 0:41 ` Mikulas Patocka
2008-05-08 16:52 ` Christoph Hellwig
2008-05-09 1:59 ` Mikulas Patocka
2008-05-06 9:13 ` [patch 07/24] fat: " Miklos Szeredi
2008-05-08 16:57 ` Christoph Hellwig
2008-05-08 18:51 ` Miklos Szeredi
2008-05-08 19:42 ` OGAWA Hirofumi
2008-05-08 23:45 ` James Morris
2008-05-06 9:13 ` [patch 08/24] vfs: immutable inode checking cleanup Miklos Szeredi
2008-05-15 7:23 ` Al Viro
2008-05-15 7:39 ` Miklos Szeredi
2008-05-06 9:13 ` [patch 09/24] vfs: truncate: dont check immutable twice Miklos Szeredi
2008-05-06 9:13 ` Miklos Szeredi [this message]
2008-05-15 7:49 ` [patch 10/24] vfs: truncate: append-only checking cleanup Al Viro
2008-05-15 7:58 ` Miklos Szeredi
2008-05-06 9:13 ` [patch 11/24] vfs: create file_truncate() helper Miklos Szeredi
2008-05-06 9:13 ` [patch 12/24] vfs: utimes immutable fix Miklos Szeredi
2008-05-06 9:13 ` [patch 13/24] vfs: utimes cleanup Miklos Szeredi
2008-05-06 10:03 ` Miklos Szeredi
2008-05-15 7:39 ` Al Viro
2008-05-15 7:45 ` Miklos Szeredi
2008-05-06 9:13 ` [patch 14/24] vfs: splice remove_suid() cleanup Miklos Szeredi
2008-05-06 9:13 ` [patch 15/24] vfs: add path_create() and path_mknod() Miklos Szeredi
2008-05-06 9:13 ` [patch 16/24] vfs: add path_mkdir() Miklos Szeredi
2008-05-06 9:13 ` [patch 17/24] vfs: add path_rmdir() Miklos Szeredi
2008-05-06 9:13 ` [patch 18/24] vfs: add path_unlink() Miklos Szeredi
2008-05-06 9:13 ` [patch 19/24] vfs: add path_symlink() Miklos Szeredi
2008-05-06 9:13 ` [patch 20/24] vfs: add path_link() Miklos Szeredi
2008-05-06 9:13 ` [patch 21/24] vfs: add path_rename() Miklos Szeredi
2008-05-06 9:13 ` [patch 22/24] vfs: add path_setattr() Miklos Szeredi
2008-05-06 9:13 ` [patch 23/24] vfs: add path_setxattr() Miklos Szeredi
2008-05-06 9:13 ` [patch 24/24] vfs: add path_removexattr() Miklos Szeredi
2008-05-06 9:16 ` [patch 00/24] vfs: fixes and cleanups + add helpers to check r/o bind mounts Christoph Hellwig
2008-05-06 10:33 ` Miklos Szeredi
2008-05-14 14:55 ` Pavel Machek
2008-05-07 11:57 ` Miklos Szeredi
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=20080506091418.842237934@szeredi.hu \
--to=miklos@szeredi.hu \
--cc=akpm@linux-foundation.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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).