From: Grant Coady <gcoady.lk@gmail.com>
To: Willy Tarreau <w@1wt.eu>
Cc: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>,
Marcelo Tosatti <marcelo@kvack.org>,
linux-kernel@vger.kernel.org
Subject: Re: Linux 2.4.33-rc1
Date: Sat, 17 Jun 2006 16:24:00 +1000 [thread overview]
Message-ID: <il57929b81lja4bb24sj77575vqibu19ev@4ax.com> (raw)
In-Reply-To: <20060617051356.GA23202@1wt.eu>
On Sat, 17 Jun 2006 07:13:57 +0200, Willy Tarreau <w@1wt.eu> wrote:
>Hi Grant,
>
>On Sat, Jun 17, 2006 at 09:24:02AM +1000, Grant Coady wrote:
>> On Sat, 17 Jun 2006 00:38:10 +0200, "Michal Piotrowski" <michal.k.k.piotrowski@gmail.com> wrote:
>>
>> >Can you revert 42cce987d63d3048595b8b00d74be786707d5e5d commit?
>>
>> Only if you point me at the patch, that string seems not to be
>> in the patch-2.4.33-rc1.gz file.
>
>First, revert this one :
>
> http://kernel.org/git/?p=linux/kernel/git/marcelo/linux-2.4.git;a=commitdiff_plain;h=efc95599c0261dd7ab3a1d9071024ca140b4c644;hp=6601095e2de35f00325a33c8be6b548f81fe76d5
>
>--- a/fs/namei.c
>+++ b/fs/namei.c
>@@ -1479,19 +1479,20 @@ int vfs_unlink(struct inode *dir, struct
> {
> int error;
>
>- double_down(&dir->i_zombie, &dentry->d_inode->i_zombie);
> error = may_delete(dir, dentry, 0);
>- if (!error) {
>- error = -EPERM;
>- if (dir->i_op && dir->i_op->unlink) {
>- DQUOT_INIT(dir);
>- if (d_mountpoint(dentry))
>- error = -EBUSY;
>- else {
>- lock_kernel();
>- error = dir->i_op->unlink(dir, dentry);
>- unlock_kernel();
>- }
>+ if (error)
>+ return error;
>+
>+ double_down(&dir->i_zombie, &dentry->d_inode->i_zombie);
>+ error = -EPERM;
>+ if (dir->i_op && dir->i_op->unlink) {
>+ DQUOT_INIT(dir);
>+ if (d_mountpoint(dentry))
>+ error = -EBUSY;
>+ else {
>+ lock_kernel();
>+ error = dir->i_op->unlink(dir, dentry);
>+ unlock_kernel();
> }
> }
> double_up(&dir->i_zombie, &dentry->d_inode->i_zombie);
>
>
>It will put you back to the state where all your machines hanged at boot
>with -hf32.5, then revert this one :
>
> http://kernel.org/git/?p=linux/kernel/git/marcelo/linux-2.4.git;a=commitdiff_plain;h=f41e0ce901260d3d1ae5bd8bae34266891b4a65d;hp=925c7ce0a2d9a676cd8e4a2baf411b23cf6762d6
>
>--- a/fs/namei.c
>+++ b/fs/namei.c
>@@ -1479,7 +1479,7 @@ int vfs_unlink(struct inode *dir, struct
> {
> int error;
>
>- down(&dir->i_zombie);
>+ double_down(&dir->i_zombie, &dentry->d_inode->i_zombie);
> error = may_delete(dir, dentry, 0);
> if (!error) {
> error = -EPERM;
>@@ -1491,14 +1491,14 @@ int vfs_unlink(struct inode *dir, struct
> lock_kernel();
> error = dir->i_op->unlink(dir, dentry);
> unlock_kernel();
>- if (!error)
>- d_delete(dentry);
> }
> }
> }
>- up(&dir->i_zombie);
>- if (!error)
>+ double_up(&dir->i_zombie, &dentry->d_inode->i_zombie);
>+ if (!error) {
>+ d_delete(dentry);
> inode_dir_notify(dir, DN_DELETE);
>+ }
> return error;
> }
>
>@@ -1607,18 +1607,19 @@ int vfs_link(struct dentry *old_dentry,
> struct inode *inode;
> int error;
>
>- down(&dir->i_zombie);
> error = -ENOENT;
> inode = old_dentry->d_inode;
> if (!inode)
>- goto exit_lock;
>-
>- error = may_create(dir, new_dentry);
>- if (error)
>- goto exit_lock;
>+ goto exit;
>
> error = -EXDEV;
> if (dir->i_dev != inode->i_dev)
>+ goto exit;
>+
>+ double_down(&dir->i_zombie, &old_dentry->d_inode->i_zombie);
>+
>+ error = may_create(dir, new_dentry);
>+ if (error)
> goto exit_lock;
>
> /*
>@@ -1636,9 +1637,10 @@ int vfs_link(struct dentry *old_dentry,
> unlock_kernel();
>
> exit_lock:
>- up(&dir->i_zombie);
>+ double_up(&dir->i_zombie, &old_dentry->d_inode->i_zombie);
> if (!error)
> inode_dir_notify(dir, DN_CREATE);
>+exit:
> return error;
> }
>
>
>And you will have something equivalent to -hf32.6 (you remember, I only
>reverted the fix in -hf32.6, and did not merge Marcelo's fix for the fix).
>Then we will have to decide whether we can fix it again or revert it
>completely. I would have liked to Cc: Vadim Egorov, but I cannot find his
>email.
>
Hi Willy, this worked.
Grant.
next prev parent reply other threads:[~2006-06-17 6:24 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-16 18:14 Marcelo Tosatti
2006-06-16 22:21 ` Grant Coady
2006-06-16 22:38 ` Michal Piotrowski
2006-06-16 23:24 ` Grant Coady
2006-06-17 5:13 ` Willy Tarreau
2006-06-17 6:24 ` Grant Coady [this message]
2006-06-17 7:10 ` Willy Tarreau
2006-06-17 17:15 ` Need to format twice /dev/ramX with reiserfs to be able to mount it ? sebastien cabaniols
2006-06-17 18:14 ` Bernd Eckenfels
2006-06-17 18:37 ` sebastien cabaniols
2006-06-17 19:55 ` Linux 2.4.33-rc1 Marcelo Tosatti
2006-06-18 13:37 ` Marcelo Tosatti
2006-06-18 22:25 ` Grant Coady
2006-06-18 22:37 ` Willy Tarreau
2006-06-18 23:07 ` Grant Coady
2006-06-19 4:01 ` Willy Tarreau
2006-06-19 5:03 ` Grant Coady
2006-06-19 8:06 ` Willy Tarreau
2006-06-19 8:53 ` Grant Coady
2006-06-19 9:08 ` Willy Tarreau
2006-06-19 9:12 ` Grant Coady
2006-06-19 9:24 ` Willy Tarreau
2006-06-19 10:27 ` Grant Coady
2006-06-19 10:31 ` Willy Tarreau
2006-06-19 20:11 ` Grant Coady
2006-06-19 20:20 ` Willy Tarreau
2006-06-19 22:04 ` Marcelo Tosatti
2006-06-19 23:00 ` Willy Tarreau
2006-06-19 23:45 ` Marcelo Tosatti
2006-06-20 22:23 ` Willy Tarreau
2006-06-21 1:09 ` Grant Coady
2006-06-21 4:05 ` Willy Tarreau
2006-06-21 13:50 ` Marcelo Tosatti
2006-06-21 20:26 ` Willy Tarreau
2006-06-18 22:33 ` Grant Coady
2006-06-18 22:40 ` Willy Tarreau
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=il57929b81lja4bb24sj77575vqibu19ev@4ax.com \
--to=gcoady.lk@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo@kvack.org \
--cc=michal.k.k.piotrowski@gmail.com \
--cc=w@1wt.eu \
/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®