From: Akinobu Mita <akinobu.mita@gmail.com>
To: linux-cifs-client@lists.samba.org
Cc: Steve French <sfrench@samba.org>, linux-fsdevel@vger.kernel.org
Subject: [PATCH] cifs: fix broken GFP_NOFS usage
Date: Sat, 24 May 2008 10:54:11 +0900 [thread overview]
Message-ID: <20080524015409.GA3304@APFDCB5C> (raw)
Some memory allocations in cifs use GFP_KERNEL | GFP_NOFS as gfs flags
but GFP_KERNEL | GFP_NOFS equals to GFP_KERNEL. So these GFP_NOFS have
no effect.
This patch fixes these flags and also removes unnecessary casts to
mempool_alloc.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Steve French <sfrench@samba.org>
Cc: linux-cifs-client@lists.samba.org
---
fs/cifs/misc.c | 6 ++----
fs/cifs/transport.c | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
Index: 2.6-git/fs/cifs/misc.c
===================================================================
--- 2.6-git.orig/fs/cifs/misc.c
+++ 2.6-git/fs/cifs/misc.c
@@ -150,8 +150,7 @@ cifs_buf_get(void)
but it may be more efficient to always alloc same size
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,
- GFP_KERNEL | GFP_NOFS);
+ ret_buf = mempool_alloc(cifs_req_poolp, GFP_NOFS);
/* clear the first few header bytes */
/* for most paths, more is cleared in header_assemble */
@@ -188,8 +187,7 @@ cifs_small_buf_get(void)
but it may be more efficient to always alloc same size
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,
- GFP_KERNEL | GFP_NOFS);
+ ret_buf = mempool_alloc(cifs_sm_req_poolp, GFP_NOFS);
if (ret_buf) {
/* No need to clear memory here, cleared in header assemble */
/* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
Index: 2.6-git/fs/cifs/transport.c
===================================================================
--- 2.6-git.orig/fs/cifs/transport.c
+++ 2.6-git/fs/cifs/transport.c
@@ -50,8 +50,7 @@ AllocMidQEntry(const struct smb_hdr *smb
return NULL;
}
- temp = (struct mid_q_entry *) mempool_alloc(cifs_mid_poolp,
- GFP_KERNEL | GFP_NOFS);
+ temp = mempool_alloc(cifs_mid_poolp, GFP_NOFS);
if (temp == NULL)
return temp;
else {
next reply other threads:[~2008-05-24 2:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-24 1:54 Akinobu Mita [this message]
2008-05-24 17:13 ` [linux-cifs-client] [PATCH] cifs: fix broken GFP_NOFS usage Günter Kukkukk
2008-05-24 18:34 ` Steve French
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080524015409.GA3304@APFDCB5C \
--to=akinobu.mita@gmail.com \
--cc=linux-cifs-client@lists.samba.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=sfrench@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).