Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Thu, 26 Sep 2002 14:20:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Thu, 26 Sep 2002 14:20:27 -0400 Received: from parcelfarce.linux.theplanet.co.uk ([195.92.249.252]:10515 "EHLO www.linux.org.uk") by vger.kernel.org with ESMTP id ; Thu, 26 Sep 2002 14:20:26 -0400 Date: Thu, 26 Sep 2002 19:25:44 +0100 From: Matthew Wilcox To: Linus Torvalds Cc: Petr Vandrovec , linux-kernel@vger.kernel.org Subject: [PATCH] Remove GFP_NFS Message-ID: <20020926192544.E28188@parcelfarce.linux.theplanet.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2621 Lines: 56 GFP_NFS means the same as GFP_KERNEL these days and it's only used by ncpfs. Looks like copy & paste from NFS code which has now changed to using the page cache. So I think we should eliminate GFP_NFS. diff -urpNX dontdiff linux-2.5.33/fs/ncpfs/symlink.c linux-2.5.33-willy/fs/ncpfs/symlink.c --- linux-2.5.33/fs/ncpfs/symlink.c 2002-09-04 07:20:56.000000000 -0600 +++ linux-2.5.33-willy/fs/ncpfs/symlink.c 2002-09-09 06:29:03.000000000 -0600 @@ -49,7 +49,7 @@ static int ncp_symlink_readpage(struct f char *buf = kmap(page); error = -ENOMEM; - rawlink=(char *)kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_NFS); + rawlink=(char *)kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL); if (!rawlink) goto fail; @@ -126,7 +126,7 @@ int ncp_symlink(struct inode *dir, struc /* EPERM is returned by VFS if symlink procedure does not exist */ return -EPERM; - rawlink=(char *)kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_NFS); + rawlink=(char *)kmalloc(NCP_MAX_SYMLINK_SIZE, GFP_KERNEL); if (!rawlink) return -ENOMEM; diff -urpNX dontdiff linux-2.5.33/include/linux/gfp.h linux-2.5.33-willy/include/linux/gfp.h --- linux-2.5.33/include/linux/gfp.h 2002-09-04 07:21:06.000000000 -0600 +++ linux-2.5.33-willy/include/linux/gfp.h 2002-09-09 06:27:59.000000000 -0600 @@ -25,7 +25,6 @@ #define GFP_USER ( __GFP_WAIT | __GFP_IO | __GFP_HIGHIO | __GFP_FS) #define GFP_HIGHUSER ( __GFP_WAIT | __GFP_IO | __GFP_HIGHIO | __GFP_FS | __GFP_HIGHMEM) #define GFP_KERNEL ( __GFP_WAIT | __GFP_IO | __GFP_HIGHIO | __GFP_FS) -#define GFP_NFS ( __GFP_WAIT | __GFP_IO | __GFP_HIGHIO | __GFP_FS) #define GFP_KSWAPD ( __GFP_WAIT | __GFP_IO | __GFP_HIGHIO | __GFP_FS) /* Flag - indicates that the buffer will be suitable for DMA. Ignored on some diff -urpNX dontdiff linux-2.5.33/include/linux/slab.h linux-2.5.33-willy/include/linux/slab.h --- linux-2.5.33/include/linux/slab.h 2002-08-02 05:44:53.000000000 -0600 +++ linux-2.5.33-willy/include/linux/slab.h 2002-09-09 06:28:31.000000000 -0600 @@ -21,7 +21,6 @@ typedef struct kmem_cache_s kmem_cache_t #define SLAB_ATOMIC GFP_ATOMIC #define SLAB_USER GFP_USER #define SLAB_KERNEL GFP_KERNEL -#define SLAB_NFS GFP_NFS #define SLAB_DMA GFP_DMA #define SLAB_LEVEL_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_HIGHIO|__GFP_FS) -- Revolutions do not require corporate support. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/