smb: client: use GFP_KERNEL for registry allocation
Subsystems (2)
PATCH 1/1 smb: client: use GFP_KERNEL for registry allocation
From: Fredric Cover <[email protected]>
Currently, cifs_get_swn_reg() allocates new registry entries using GFP_ATOMIC. Since we lock a mutex here, this is clearly not an atomic context. Use GFP_KERNEL instead.
Also, fix a minor grammatical error in the comment above the function.
Signed-off-by Fredric Cover <[email protected]>
--- fs/smb/client/cifs_swn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/smb/client/cifs_swn.c +3 -3
@@ -425,7 +425,7 @@ static struct cifs_swn_reg *cifs_find_swn_reg(struct cifs_tcon *tcon)/* * Get a registration for the tcon's server and share name, allocating a new one if it does not -* exists +* exist. */ static struct cifs_swn_reg *cifs_get_swn_reg (struct cifs_tcon *tcon) {
@@ -443,7 +443,7 @@ static struct cifs_swn_reg *cifs_get_swn_reg(struct cifs_tcon *tcon) goto unlock; } - reg = kmalloc_obj(struct cifs_swn_reg, GFP_ATOMIC); + reg = kmalloc_obj(struct cifs_swn_reg, GFP_KERNEL);if (reg ==NULL ) { ret = -ENOMEM ; goto fail_unlock;
@@ -451,7 +451,7 @@ static struct cifs_swn_reg *cifs_get_swn_reg(struct cifs_tcon *tcon)kref_init (®->ref_count); - reg->id =idr_alloc (&cifs_swnreg_idr, reg,1 ,0 ,GFP_ATOMIC ); + reg->id =idr_alloc (&cifs_swnreg_idr, reg,1 ,0 ,GFP_KERNEL );if (reg->id <0 ) {cifs_dbg (FYI ,"%s: failed to allocate registration id\n" , __func__); ret = reg->id;
Signature · 1 line
2.53.0
Steve French
Appliedmerged into cifs-2.6.git for-next
Quoted 49 lines · Fredric Cover
From: Fredric Cover <[email protected]>
Currently,
cifs_get_swn_reg()allocates new registry entries usingGFP_ATOMIC. Since we lock a mutex here, this is clearly not an atomic context. UseGFP_KERNELinstead.Also, fix a minor grammatical error in the comment above the function.
Signed-off-by Fredric Cover <[email protected]>--- fs/smb/client/cifs_swn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)fs/smb/client/cifs_swn.c +3
-4@@ -425,7 +425,7 @@ static struct cifs_swn_reg *cifs_find_swn_reg(struct cifs_tcon *tcon)/* * Get a registration for the tcon's server and share name, allocating a new one if it does not -* exists +* exist. */ static struct cifs_swn_reg *cifs_get_swn_reg (struct cifs_tcon *tcon) {@@ -443,7 +443,7 @@ static struct cifs_swn_reg *cifs_get_swn_reg(struct cifs_tcon *tcon) goto unlock; } - reg = kmalloc_obj(struct cifs_swn_reg, GFP_ATOMIC); + reg = kmalloc_obj(struct cifs_swn_reg, GFP_KERNEL);if (reg ==NULL ) { ret = -ENOMEM ; goto fail_unlock;@@ -451,7 +451,7 @@ static struct cifs_swn_reg *cifs_get_swn_reg(struct cifs_tcon *tcon)kref_init (®->ref_count); - reg->id =idr_alloc (&cifs_swnreg_idr, reg,1 ,0 ,GFP_ATOMIC ); + reg->id =idr_alloc (&cifs_swnreg_idr, reg,1 ,0 ,GFP_KERNEL );if (reg->id <0 ) {cifs_dbg (FYI ,"%s: failed to allocate registration id\n" , __func__); ret = reg->id; --2.53.0
Signature · 3 lines
Thanks, Steve