mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Miklos Szeredi <miklos@szeredi.hu>
To: akpm@linux-foundation.org
Cc: hch@infradead.org, viro@ZenIV.linux.org.uk,
	linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [patch 11/15] vfs: truncate: append-only checking cleanup
Date: Mon, 05 May 2008 11:54:52 +0200	[thread overview]
Message-ID: <20080505095524.893316989@szeredi.hu> (raw)
In-Reply-To: <20080505095440.820370974@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-05 11:29:27.000000000 +0200
+++ linux-2.6/fs/open.c	2008-05-05 11:29:27.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-05 11:29:26.000000000 +0200
+++ linux-2.6/fs/attr.c	2008-05-05 11:29:27.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-05 11:29:20.000000000 +0200
+++ linux-2.6/fs/namei.c	2008-05-05 11:29:27.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 */

--

  parent reply	other threads:[~2008-05-05 10:00 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-05  9:54 [patch 00/15] VFS fixes and cleanups Miklos Szeredi
2008-05-05  9:54 ` [patch 01/15] ecryptfs: clean up (un)lock_parent Miklos Szeredi
2008-05-05 10:59   ` Christoph Hellwig
2008-05-05  9:54 ` [patch 02/15] nfsd: clean up mnt_want_write calls Miklos Szeredi
2008-05-05 10:59   ` Christoph Hellwig
2008-05-05  9:54 ` [patch 03/15] cgroup: dont call vfs_mkdir Miklos Szeredi
2008-05-05 11:00   ` Christoph Hellwig
2008-05-05 12:32     ` Miklos Szeredi
2008-05-05 13:08       ` Christoph Hellwig
2008-05-05 13:29         ` Miklos Szeredi
2008-05-05 13:33           ` Christoph Hellwig
2008-05-05 13:43             ` Miklos Szeredi
2008-05-05 13:46               ` Christoph Hellwig
2008-05-05 13:57                 ` Miklos Szeredi
2008-05-05 17:22   ` Paul Menage
2008-05-05  9:54 ` [patch 04/15] reiserfs: dont call vfs_rmdir Miklos Szeredi
2008-05-05  9:54 ` [patch 05/15] reiserfs: dont call notify_change Miklos Szeredi
2008-05-05  9:54 ` [patch 06/15] sysfs: " Miklos Szeredi
2008-05-06  4:15   ` Greg KH
2008-05-06  6:28     ` Miklos Szeredi
2008-05-06  6:48       ` Greg KH
2008-05-05  9:54 ` [patch 07/15] hpfs: " Miklos Szeredi
2008-05-08  0:42   ` Mikulas Patocka
2008-05-05  9:54 ` [patch 08/15] fat: " Miklos Szeredi
2008-05-05 19:45   ` OGAWA Hirofumi
2008-05-06  8:49     ` Miklos Szeredi
2008-05-06  9:27       ` OGAWA Hirofumi
2008-05-05  9:54 ` [patch 09/15] vfs: immutable inode checking cleanup Miklos Szeredi
2008-05-05 11:01   ` Christoph Hellwig
2008-05-05  9:54 ` [patch 10/15] vfs: truncate: dont check immutable twice Miklos Szeredi
2008-05-05 11:04   ` Christoph Hellwig
2008-05-05  9:54 ` Miklos Szeredi [this message]
2008-05-05 11:12   ` [patch 11/15] vfs: truncate: append-only checking cleanup Christoph Hellwig
2008-05-05  9:54 ` [patch 12/15] vfs: create file_truncate() helper Miklos Szeredi
2008-05-05 11:06   ` Christoph Hellwig
2008-05-05 12:35     ` Miklos Szeredi
2008-05-05  9:54 ` [patch 13/15] vfs: utimes cleanup Miklos Szeredi
2008-05-05 11:30   ` Christoph Hellwig
2008-05-05 12:39     ` Miklos Szeredi
2008-05-05 13:04       ` Christoph Hellwig
2008-05-05  9:54 ` [patch 14/15] vfs: utimes immutable fix Miklos Szeredi
2008-05-05 11:14   ` Christoph Hellwig
2008-05-05  9:54 ` [patch 15/15] vfs: splice remove_suid() cleanup Miklos Szeredi
2008-05-05 11:11   ` Christoph Hellwig
2008-05-07  7:20   ` Jens Axboe

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=20080505095524.893316989@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

all inboxes | Powered by JetHome®