From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnaud Lacombe Subject: Re: [PATCH] vfs: make unlink() return ENOENT in preference to EROFS Date: Mon, 6 Jun 2011 16:45:19 -0400 Message-ID: References: <1307392610-27911-1-git-send-email-tytso@mit.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk To: "Theodore Ts'o" Return-path: In-Reply-To: <1307392610-27911-1-git-send-email-tytso@mit.edu> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Hi, On Mon, Jun 6, 2011 at 4:36 PM, Theodore Ts'o wrote: > If user space attempts to unlink a non-existent file, and the file > system is mounted read-only, return ENOENT instead of EROFS. =A0Eithe= r > error code is arguably valid/correct, but ENOENT is a more specific > error message. > > Reported-by: Michael Tokarev > Signed-off-by: "Theodore Ts'o" > --- > =A0fs/namei.c | =A0 =A04 ++-- > =A01 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 __u= ser *pathname) > =A0 =A0 =A0 =A0error =3D PTR_ERR(dentry); > =A0 =A0 =A0 =A0if (!IS_ERR(dentry)) { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* Why not before? Because we want cor= rect error value */ > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (nd.last.name[nd.last.len]) > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto slashes; > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0inode =3D dentry->d_inode; > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (nd.last.name[nd.last.len] || !inode= ) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto slashes; > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (inode) > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ihold(inode); It seems to me that this conditional will now always be verified as you jump to `slashes' whenever `inode' is NULL, no ? - Arnaud > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0error =3D mnt_want_write(nd.path.mnt); > -- > 1.7.4.1.22.gec8e1.dirty > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kerne= l" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at =A0http://vger.kernel.org/majordomo-info.html > Please read the FAQ at =A0http://www.tux.org/lkml/ >