From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Nov 2024 20:34:50 +0000 (-0800)
Subject: Merge tag 'gfs2-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux... 
X-Git-Tag: microblaze-v6.16~543
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=ff2a7a064a69069554564f52b6a84fc8a8c7d688;p=linux-2.6-microblaze.git

Merge tag 'gfs2-for-6.13' of git://git./linux/kernel/git/gfs2/linux-gfs2

Pull gfs2 updates from Andreas Gruenbacher:

 - Fix the code that cleans up left-over unlinked files.

   Various fixes and minor improvements in deleting files cached or held
   open remotely.

 - Simplify the use of dlm's DLM_LKF_QUECVT flag.

 - A few other minor cleanups.

* tag 'gfs2-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2: (21 commits)
  gfs2: Prevent inode creation race
  gfs2: Only defer deletes when we have an iopen glock
  gfs2: Simplify DLM_LKF_QUECVT use
  gfs2: gfs2_evict_inode clarification
  gfs2: Make gfs2_inode_refresh static
  gfs2: Use get_random_u32 in gfs2_orlov_skip
  gfs2: Randomize GLF_VERIFY_DELETE work delay
  gfs2: Use mod_delayed_work in gfs2_queue_try_to_evict
  gfs2: Update to the evict / remote delete documentation
  gfs2: Call gfs2_queue_verify_delete from gfs2_evict_inode
  gfs2: Clean up delete work processing
  gfs2: Minor delete_work_func cleanup
  gfs2: Return enum evict_behavior from gfs2_upgrade_iopen_glock
  gfs2: Rename dinode_demise to evict_behavior
  gfs2: Rename GIF_{DEFERRED -> DEFER}_DELETE
  gfs2: Faster gfs2_upgrade_iopen_glock wakeups
  KMSAN: uninit-value in inode_go_dump (5)
  gfs2: Fix unlinked inode cleanup
  gfs2: Allow immediate GLF_VERIFY_DELETE work
  gfs2: Initialize gl_no_formal_ino earlier
  ...
---

ff2a7a064a69069554564f52b6a84fc8a8c7d688
diff --cc fs/gfs2/glock.c
index 4701c4aafbf4,8db92a36194a..8c4c1f871a88
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@@ -34,7 -34,9 +34,8 @@@
  #include <linux/lockref.h>
  #include <linux/rhashtable.h>
  #include <linux/pid_namespace.h>
 -#include <linux/fdtable.h>
  #include <linux/file.h>
+ #include <linux/random.h>
  
  #include "gfs2.h"
  #include "incore.h"