The patch titled nfs: fix nfs_remount oops when rebooting has been removed from the -mm tree. Its filename was nfs-fix-nfs_remount-oops-when-rebooting.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: nfs: fix nfs_remount oops when rebooting From: Marc Zyngier <maz@xxxxxxxxxxxxxxx> The commit commit 48b605f83c920d8daa50e43fc2c7f718e04c7bfa Author: Jeff Layton <jlayton@xxxxxxxxxx> Date: Tue Jun 10 15:38:39 2008 -0400 NFS: implement option checking when remounting NFS filesystems (resend) generates an Oops on my platform when rebooting while its root FS on an NFS share (NFSv3, TCP). The new super.c:nfs_remount function doesn't check the validity of the options/options4 pointers. Unfortunately, this seems to happen. The obvious patch seems to check the pointers, and not to do anything if the happend to be NULL. Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxxxxx> Acked-by: Jeff Layton <jlayton@xxxxxxxxxx> Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx> Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/nfs/super.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff -puN fs/nfs/super.c~nfs-fix-nfs_remount-oops-when-rebooting fs/nfs/super.c --- a/fs/nfs/super.c~nfs-fix-nfs_remount-oops-when-rebooting +++ a/fs/nfs/super.c @@ -1718,9 +1718,10 @@ nfs_remount(struct super_block *sb, int * ones were explicitly specified. Fall back to legacy behavior and * just return success. */ - if ((nfsvers == 4 && options4->version == 1) || - (nfsvers <= 3 && options->version >= 1 && - options->version <= 6)) + + if ((nfsvers == 4 && (!options4 || options4->version == 1)) || + (nfsvers <= 3 && (!options || (options->version >= 1 && + options->version <= 6)))) return 0; data = kzalloc(sizeof(*data), GFP_KERNEL); _ Patches currently in -mm which might be from maz@xxxxxxxxxxxxxxx are origin.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html