linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] vfs: make unlink() return ENOENT in preference to EROFS
@ 2011-06-06 20:36 Theodore Ts'o
  2011-06-06 20:45 ` Arnaud Lacombe
  0 siblings, 1 reply; 10+ messages in thread
From: Theodore Ts'o @ 2011-06-06 20:36 UTC (permalink / raw)
  To: linux-fsdevel, linux-kernel, viro; +Cc: Theodore Ts'o

If user space attempts to unlink a non-existent file, and the file
system is mounted read-only, return ENOENT instead of EROFS.  Either
error code is arguably valid/correct, but ENOENT is a more specific
error message.

Reported-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 fs/namei.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 1ab641f..a9edbe0 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2708,9 +2708,9 @@ static long do_unlinkat(int dfd, const char __user *pathname)
 	error = PTR_ERR(dentry);
 	if (!IS_ERR(dentry)) {
 		/* Why not before? Because we want correct error value */
-		if (nd.last.name[nd.last.len])
-			goto slashes;
 		inode = dentry->d_inode;
+		if (nd.last.name[nd.last.len] || !inode)
+			goto slashes;
 		if (inode)
 			ihold(inode);
 		error = mnt_want_write(nd.path.mnt);
-- 
1.7.4.1.22.gec8e1.dirty


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: unlink(nonexistent): EROFS or ENOENT?
@ 2011-06-06 19:55 Ted Ts'o
  2011-06-06 20:37 ` [PATCH] vfs: make unlink() return ENOENT in preference to EROFS Theodore Ts'o
  0 siblings, 1 reply; 10+ messages in thread
From: Ted Ts'o @ 2011-06-06 19:55 UTC (permalink / raw)
  To: Michael Tokarev; +Cc: Linux-kernel, linux-fsdevel

On Mon, Jun 06, 2011 at 09:13:23PM +0400, Michael Tokarev wrote:
> Thank you for the answer.  I thought noone will reply... ;)
> 
> >> Just noticed that at least on ext4, unlinking a
> >> non-existing file from a read-only filesystem
> >> results in EROFS instead of ENOENT.  I'd expect
> >> it return ENOENT - it is more logical, at least
> >> in my opinion.

>   /* The unlinkat from kernels like linux-2.6.32 reports EROFS even for
>      nonexistent files.  When the file is indeed missing, map that to ENOENT,
>      so that rm -f ignores it, as required.  Even without -f, this is useful
>      because it makes rm print the more precise diagnostic.  */

OK, I see what's going on.  This check is in the VFS layer, so it
affects all filesystems; it's not an ext4-specific thing.

Patch coming shortly.

	    		      	     		   - Ted

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-07-02  0:50 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-06 20:36 [PATCH] vfs: make unlink() return ENOENT in preference to EROFS Theodore Ts'o
2011-06-06 20:45 ` Arnaud Lacombe
2011-06-06 20:58   ` [PATCH -v2] " Theodore Ts'o
2011-06-06 22:30     ` Al Viro
2011-06-06 22:48       ` Michael Tokarev
2011-06-06 23:19         ` [PATCH -v3] vfs: make unlink() and rmdir() " Theodore Ts'o
2011-06-07  0:05           ` Al Viro
2011-06-07 14:16           ` Michael Tokarev
2011-07-02  0:50           ` [-v3] " Michael Tokarev
  -- strict thread matches above, loose matches on Subject: below --
2011-06-06 19:55 unlink(nonexistent): EROFS or ENOENT? Ted Ts'o
2011-06-06 20:37 ` [PATCH] vfs: make unlink() return ENOENT in preference to EROFS Theodore Ts'o

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).