[Cluster-devel] Andy gfs2 patches?

2023-03-23 Thread Andreas Gruenbacher


Re: [Cluster-devel] [GIT PULL] gfs2 fix for v6.3-rc4

2023-03-23 Thread pr-tracker-bot
The pull request you sent on Thu, 23 Mar 2023 19:45:37 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git 
> gfs2-v6.3-rc3-fix

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1e760fa3596e8c7f08412712c168288b79670d78

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html



Re: [Cluster-devel] [GIT PULL] gfs2 fix for v6.3-rc4

2023-03-23 Thread Linus Torvalds
On Thu, Mar 23, 2023 at 3:22 PM Andreas Grünbacher
 wrote:
>
> I've pushed the tag out now; should I resend the pull request?

No, all good, I have the changes,

Linus



Re: [Cluster-devel] [GIT PULL] gfs2 fix for v6.3-rc4

2023-03-23 Thread Andreas Grünbacher
Am Do., 23. März 2023 um 22:54 Uhr schrieb Linus Torvalds
:
> On Thu, Mar 23, 2023 at 11:45 AM Andreas Gruenbacher  
> wrote:
> >
> > From: Linus Torvalds 
>
> Wat?

Hmm, that's weird, you ended up in the From: header by accident. Sorry for that.

> >   git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git 
> > gfs2-v6.3-rc3-fix
>
> -ENOSUCHTAG
>
> > for you to fetch changes up to 260595b439776c473cc248f0de63fe78d964d849:
>
> .. and no such commit available in any other tag or branch either.
>
> Did you forget to push out?

Yes, I did forget to push the tag out and I've missed the warning "git
request-pull" has spit out. Sorry again.

I've pushed the tag out now; should I resend the pull request?

Thanks,
Andreas



Re: [Cluster-devel] [GIT PULL] gfs2 fix for v6.3-rc4

2023-03-23 Thread Linus Torvalds
On Thu, Mar 23, 2023 at 11:45 AM Andreas Gruenbacher
 wrote:
>
> From: Linus Torvalds 

Wat?

>   git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git 
> gfs2-v6.3-rc3-fix

-ENOSUCHTAG

> for you to fetch changes up to 260595b439776c473cc248f0de63fe78d964d849:

.. and no such commit available in any other tag or branch either.

Did you forget to push out?

Linus



[Cluster-devel] [GIT PULL] gfs2 fix for v6.3-rc4

2023-03-23 Thread Andreas Gruenbacher
From: Linus Torvalds 

Hi Linus,

please consider pulling the following fix.

Thanks,
Andreas

The following changes since commit e8d018dd0257f744ca50a729e3d042cf2ec9da65:

  Linux 6.3-rc3 (2023-03-19 13:27:55 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git 
gfs2-v6.3-rc3-fix

for you to fetch changes up to 260595b439776c473cc248f0de63fe78d964d849:

  Reinstate "GFS2: free disk inode which is deleted by remote node -V2" 
(2023-03-23 19:37:56 +0100)


gfs2 fix

- Reinstate commit 970343cd4904 ("GFS2: free disk inode which is deleted
  by remote node -V2") as reverting that commit could cause
  gfs2_put_super() to hang.


Bob Peterson (1):
  Reinstate "GFS2: free disk inode which is deleted by remote node -V2"

 fs/gfs2/dentry.c | 18 ++
 1 file changed, 18 insertions(+)



[Cluster-devel] [PATCH] Revert "Revert "GFS2: free disk inode which is deleted by remote node -V2""

2023-03-23 Thread Bob Peterson
It turns out that reverting 970343cd4904 causes a regression related to
evicting inodes that were unlinked on a different cluster node.

We could also have simply added a call to d_mark_dontcache to function
gfs2_try_evict but the original pre-revert code is better tested and
proven.

This reverts commit 445cb1277e10d7e19b631ef8a64aa3f055df377d.
---
 fs/gfs2/dentry.c | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/fs/gfs2/dentry.c b/fs/gfs2/dentry.c
index 6fe9ca253b70..2e215e8c3c88 100644
--- a/fs/gfs2/dentry.c
+++ b/fs/gfs2/dentry.c
@@ -83,8 +83,26 @@ static int gfs2_dhash(const struct dentry *dentry, struct 
qstr *str)
return 0;
 }
 
+static int gfs2_dentry_delete(const struct dentry *dentry)
+{
+   struct gfs2_inode *ginode;
+
+   if (d_really_is_negative(dentry))
+   return 0;
+
+   ginode = GFS2_I(d_inode(dentry));
+   if (!gfs2_holder_initialized(>i_iopen_gh))
+   return 0;
+
+   if (test_bit(GLF_DEMOTE, >i_iopen_gh.gh_gl->gl_flags))
+   return 1;
+
+   return 0;
+}
+
 const struct dentry_operations gfs2_dops = {
.d_revalidate = gfs2_drevalidate,
.d_hash = gfs2_dhash,
+   .d_delete = gfs2_dentry_delete,
 };
 
-- 
2.39.2