From acc56e3dd3cc18d10637cf39212c80c809cc633f Mon Sep 17 00:00:00 2001 From: yangsheng Date: Fri, 17 Aug 2007 04:12:12 +0000 Subject: [PATCH] Branch b1_6 b=11248 i=scjody i=adilger Remove mnt_lustre_list from vfs_intent-2.6-rhel4.patch. --- lustre/ChangeLog | 5 +++++ lustre/kernel_patches/patches/vfs_intent-2.6-rhel4.patch | 11 +---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 1c8a431..e14c210 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -41,6 +41,11 @@ Bugzilla : 12836 Description: lfs find on -1 stripe looping in lsm_lmm_verify_common() Details : Avoid lov_verify_lmm_common() on directory with -1 stripe count. +Severity : normal +Bugzilla : 11248 +Description: merge and cleanup kernel patches. +Details : Remove mnt_lustre_list in vfs_intent-2.6-rhel4.patch. + -------------------------------------------------------------------------------- 2007-08-27 Cluster File Systems, Inc. diff --git a/lustre/kernel_patches/patches/vfs_intent-2.6-rhel4.patch b/lustre/kernel_patches/patches/vfs_intent-2.6-rhel4.patch index 1e659f5..0b8f12f 100644 --- a/lustre/kernel_patches/patches/vfs_intent-2.6-rhel4.patch +++ b/lustre/kernel_patches/patches/vfs_intent-2.6-rhel4.patch @@ -581,14 +581,6 @@ diff -rup RH_2_6_9_55.orig/fs/namei.c RH_2_6_9_55/fs/namei.c diff -urNp RH_2_6_9_42_0_3.orig/fs/namespace.c RH_2_6_9_42_0_3/fs/namespace.c --- RH_2_6_9_42_0_3.orig/fs/namespace.c +++ RH_2_6_9_42_0_3/fs/namespace.c -@@ -61,6 +61,7 @@ struct vfsmount *alloc_vfsmnt(const char - INIT_LIST_HEAD(&mnt->mnt_mounts); - INIT_LIST_HEAD(&mnt->mnt_list); - INIT_LIST_HEAD(&mnt->mnt_fslink); -+ INIT_LIST_HEAD(&mnt->mnt_lustre_list); - if (name) { - int size = strlen(name)+1; - char *newname = kmalloc(size, GFP_KERNEL); @@ -114,6 +115,7 @@ static inline int check_mnt(struct vfsmo static void detach_mnt(struct vfsmount *mnt, struct nameidata *old_nd) @@ -1344,11 +1336,10 @@ diff -rup RH_2_6_9_55.orig/include/linux/fs.h RH_2_6_9_55/include/linux/fs.h diff -rup RH_2_6_9_55.orig/include/linux/mount.h RH_2_6_9_55/include/linux/mount.h --- RH_2_6_9_55.orig/include/linux/mount.h +++ RH_2_6_9_55/include/linux/mount.h -@@ -34,6 +34,8 @@ struct vfsmount +@@ -34,6 +34,7 @@ struct vfsmount struct list_head mnt_list; struct list_head mnt_fslink; /* link in fs-specific expiry list */ struct namespace *mnt_namespace; /* containing namespace */ -+ struct list_head mnt_lustre_list; /* GNS mount list */ + unsigned long mnt_last_used; /* for GNS auto-umount (jiffies) */ }; -- 1.8.3.1