Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6b4f8da authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] slab: remove SLAB_NOFS 



SLAB_NOFS is an alias of GFP_NOFS.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 55acbda0

fs/cifs/misc.c

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ cifs_buf_get(void) 
   albeit slightly larger than necessary and maxbuffersize 

   defaults to this and can not be bigger */

	ret_buf =

	    (struct smb_hdr *) mempool_alloc(cifs_req_poolp, SLAB_KERNEL | SLAB_NOFS);

	    (struct smb_hdr *) mempool_alloc(cifs_req_poolp, SLAB_KERNEL | GFP_NOFS);



	/* clear the first few header bytes */

	/* for most paths, more is cleared in header_assemble */
@@ -192,7 +192,7 @@ cifs_small_buf_get(void) 
   albeit slightly larger than necessary and maxbuffersize 

   defaults to this and can not be bigger */

	ret_buf =

	    (struct smb_hdr *) mempool_alloc(cifs_sm_req_poolp, SLAB_KERNEL | SLAB_NOFS);

	    (struct smb_hdr *) mempool_alloc(cifs_sm_req_poolp, SLAB_KERNEL | GFP_NOFS);

	if (ret_buf) {

	/* No need to clear memory here, cleared in header assemble */

	/*	memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/

fs/cifs/transport.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct cifsSesInfo *ses) 
	}

	

	temp = (struct mid_q_entry *) mempool_alloc(cifs_mid_poolp,

						    SLAB_KERNEL | SLAB_NOFS);

						    SLAB_KERNEL | GFP_NOFS);

	if (temp == NULL)

		return temp;

	else {

fs/dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ static struct dquot *get_empty_dquot(struct super_block *sb, int type) 
{

	struct dquot *dquot;



	dquot = kmem_cache_alloc(dquot_cachep, SLAB_NOFS);

	dquot = kmem_cache_alloc(dquot_cachep, GFP_NOFS);

	if(!dquot)

		return NODQUOT;

fs/ext3/super.c

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static struct inode *ext3_alloc_inode(struct super_block *sb) 
{

	struct ext3_inode_info *ei;



	ei = kmem_cache_alloc(ext3_inode_cachep, SLAB_NOFS);

	ei = kmem_cache_alloc(ext3_inode_cachep, GFP_NOFS);

	if (!ei)

		return NULL;

#ifdef CONFIG_EXT3_FS_POSIX_ACL

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static struct inode *ext4_alloc_inode(struct super_block *sb) 
{

	struct ext4_inode_info *ei;



	ei = kmem_cache_alloc(ext4_inode_cachep, SLAB_NOFS);

	ei = kmem_cache_alloc(ext4_inode_cachep, GFP_NOFS);

	if (!ei)

		return NULL;

#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL