From 92371087445f79230ee378089103f6886aea4dfd Mon Sep 17 00:00:00 2001 From: pschwan Date: Mon, 2 Jun 2003 06:28:04 +0000 Subject: [PATCH] update invalidate_show again for 2.4.20-9; 2.4.20-8 is no longer supported. --- .../patches/invalidate_show-2.4.20-rh.patch | 50 +++++++++++----------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/lustre/kernel_patches/patches/invalidate_show-2.4.20-rh.patch b/lustre/kernel_patches/patches/invalidate_show-2.4.20-rh.patch index 08dce83..6e7d920 100644 --- a/lustre/kernel_patches/patches/invalidate_show-2.4.20-rh.patch +++ b/lustre/kernel_patches/patches/invalidate_show-2.4.20-rh.patch @@ -1,8 +1,12 @@ - 0 files changed + fs/inode.c | 23 +++++++++++++++-------- + fs/smbfs/inode.c | 2 +- + fs/super.c | 4 ++-- + include/linux/fs.h | 2 +- + 4 files changed, 19 insertions(+), 12 deletions(-) ---- linux-2.4.20-rh/fs/inode.c~invalidate_show-2.4.20-rh 2003-05-29 22:03:23.000000000 +0800 -+++ linux-2.4.20-rh-root/fs/inode.c 2003-05-29 22:03:46.000000000 +0800 -@@ -604,7 +604,8 @@ static void dispose_list(struct list_hea +--- kernel-2.4.20/fs/inode.c~invalidate_show-2.4.20-rh 2003-05-24 01:56:40.000000000 -0400 ++++ kernel-2.4.20-root/fs/inode.c 2003-06-02 00:35:37.000000000 -0400 +@@ -628,7 +628,8 @@ static void dispose_list(struct list_hea /* * Invalidate all inodes for a device. */ @@ -12,7 +16,7 @@ { struct list_head *next; int busy = 0, count = 0; -@@ -629,6 +630,11 @@ static int invalidate_list(struct list_h +@@ -653,6 +654,11 @@ static int invalidate_list(struct list_h count++; continue; } @@ -24,7 +28,7 @@ busy = 1; } /* only unused inodes may be cached with i_count zero */ -@@ -647,24 +653,25 @@ static int invalidate_list(struct list_h +@@ -671,23 +677,24 @@ static int invalidate_list(struct list_h /** * invalidate_inodes - discard the inodes on a device * @sb: superblock @@ -44,20 +48,18 @@ spin_lock(&inode_lock); - busy = invalidate_list(&inode_in_use, sb, &throw_away); - busy |= invalidate_list(&inode_unused, sb, &throw_away); +- busy |= invalidate_list(&inode_unused_pagecache, sb, &throw_away); - busy |= invalidate_list(&sb->s_dirty, sb, &throw_away); - busy |= invalidate_list(&sb->s_locked_inodes, sb, &throw_away); -- spin_unlock(&inode_lock); -- -+ busy = invalidate_list(&inode_in_use, sb, &throw_away, show); -+ busy |= invalidate_list(&inode_unused, sb, &throw_away, show); -+ busy |= invalidate_list(&inode_unused_pagecache, sb, &throw_away, show); -+ busy |= invalidate_list(&sb->s_dirty, sb, &throw_away, show); -+ busy |= invalidate_list(&sb->s_locked_inodes, sb, &throw_away, show); -+ spin_unlock(&inode_lock); - dispose_list(&throw_away); ++ busy = invalidate_list(&inode_in_use, sb, &throw_away, show); ++ busy |= invalidate_list(&inode_unused, sb, &throw_away, show); ++ busy |= invalidate_list(&inode_unused_pagecache, sb, &throw_away, show); ++ busy |= invalidate_list(&sb->s_dirty, sb, &throw_away, show); ++ busy |= invalidate_list(&sb->s_locked_inodes, sb, &throw_away, show); + spin_unlock(&inode_lock); - return busy; -@@ -688,7 +695,7 @@ int invalidate_device(kdev_t dev, int do + dispose_list(&throw_away); +@@ -713,7 +720,7 @@ int invalidate_device(kdev_t dev, int do * hold). */ shrink_dcache_sb(sb); @@ -66,8 +68,8 @@ drop_super(sb); } invalidate_buffers(dev); ---- linux-2.4.20-rh/fs/super.c~invalidate_show-2.4.20-rh 2003-04-11 14:04:57.000000000 +0800 -+++ linux-2.4.20-rh-root/fs/super.c 2003-05-29 22:03:27.000000000 +0800 +--- kernel-2.4.20/fs/super.c~invalidate_show-2.4.20-rh 2003-05-24 01:56:24.000000000 -0400 ++++ kernel-2.4.20-root/fs/super.c 2003-06-02 00:35:00.000000000 -0400 @@ -943,7 +943,7 @@ void kill_super(struct super_block *sb) lock_super(sb); lock_kernel(); @@ -86,9 +88,9 @@ printk(KERN_ERR "VFS: Busy inodes after unmount. " "Self-destruct in 5 seconds. Have a nice day...\n"); } ---- linux-2.4.20-rh/include/linux/fs.h~invalidate_show-2.4.20-rh 2003-05-29 21:50:30.000000000 +0800 -+++ linux-2.4.20-rh-root/include/linux/fs.h 2003-05-29 22:03:27.000000000 +0800 -@@ -1283,7 +1283,7 @@ static inline void mark_buffer_dirty_ino +--- kernel-2.4.20/include/linux/fs.h~invalidate_show-2.4.20-rh 2003-06-02 00:31:47.000000000 -0400 ++++ kernel-2.4.20-root/include/linux/fs.h 2003-06-02 00:35:00.000000000 -0400 +@@ -1284,7 +1284,7 @@ static inline void mark_buffer_dirty_ino extern void set_buffer_flushtime(struct buffer_head *); extern void balance_dirty(void); extern int check_disk_change(kdev_t); @@ -97,8 +99,8 @@ extern int invalidate_device(kdev_t, int); extern void invalidate_inode_pages(struct inode *); extern void invalidate_inode_pages2(struct address_space *); ---- linux-2.4.20-rh/fs/smbfs/inode.c~invalidate_show-2.4.20-rh 2003-04-16 20:59:48.000000000 +0800 -+++ linux-2.4.20-rh-root/fs/smbfs/inode.c 2003-05-29 22:03:27.000000000 +0800 +--- kernel-2.4.20/fs/smbfs/inode.c~invalidate_show-2.4.20-rh 2002-11-28 18:53:15.000000000 -0500 ++++ kernel-2.4.20-root/fs/smbfs/inode.c 2003-06-02 00:35:00.000000000 -0400 @@ -167,7 +167,7 @@ smb_invalidate_inodes(struct smb_sb_info { VERBOSE("\n"); -- 1.8.3.1