From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Nov 2023 19:54:17 +0000 (-0800)
Subject: Merge tag 'gfs2-v6.6-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1a0507d8780e2902c4c17c5a4c45d298bd7048af;p=linux.git

Merge tag 'gfs2-v6.6-rc2-fixes' of git://git./linux/kernel/git/gfs2/linux-gfs2

Pull gfs2 updates from Andreas Gruenbacher:

 - Don't update inode timestamps for direct writes (performance
   regression fix)

 - Skip no-op quota records instead of panicing

 - Fix a RCU race in gfs2_permission()

 - Various other smaller fixes and cleanups all over the place

* tag 'gfs2-v6.6-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2: (24 commits)
  gfs2: don't withdraw if init_threads() got interrupted
  gfs2: remove dead code in add_to_queue
  gfs2: Fix slab-use-after-free in gfs2_qd_dealloc
  gfs2: Silence "suspicious RCU usage in gfs2_permission" warning
  gfs2: fs: derive f_fsid from s_uuid
  gfs2: No longer use 'extern' in function declarations
  gfs2: Rename gfs2_lookup_{ simple => meta }
  gfs2: Convert gfs2_internal_read to folios
  gfs2: Convert stuffed_readpage to folios
  gfs2: Minor gfs2_write_jdata_batch PAGE_SIZE cleanup
  gfs2: Get rid of gfs2_alloc_blocks generation parameter
  gfs2: Add metapath_dibh helper
  gfs2: Clean up quota.c:print_message
  gfs2: Clean up gfs2_alloc_parms initializers
  gfs2: Two quota=account mode fixes
  gfs2: Stop using GFS2_BASIC_BLOCK and GFS2_BASIC_BLOCK_SHIFT
  gfs2: setattr_chown: Add missing initialization
  gfs2: fix an oops in gfs2_permission
  gfs2: ignore negated quota changes
  gfs2: Don't update inode timestamps for direct writes
  ...
---

1a0507d8780e2902c4c17c5a4c45d298bd7048af
diff --cc fs/gfs2/quota.h
index 36f54b426b0c3,b7e4661884944..f462d9cb30876
--- a/fs/gfs2/quota.h
+++ b/fs/gfs2/quota.h
@@@ -60,9 -59,9 +59,10 @@@ static inline int gfs2_quota_lock_check
  }
  
  extern const struct quotactl_ops gfs2_quotactl_ops;
 -extern struct shrinker gfs2_qd_shrinker;
 +int __init gfs2_qd_shrinker_init(void);
 +void gfs2_qd_shrinker_exit(void);
  extern struct list_lru gfs2_qd_lru;
- extern void __init gfs2_quota_hash_init(void);
+ 
+ void __init gfs2_quota_hash_init(void);
  
  #endif /* __QUOTA_DOT_H__ */