Commit 156cd285 authored by Trond Myklebust's avatar Trond Myklebust

NFS: Don't allocate nfs_fattr on the stack in __nfs42_ssc_open()

The preferred behaviour is always to allocate struct nfs_fattr from the
slab.
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent e48c81bb
...@@ -317,7 +317,7 @@ static int read_name_gen = 1; ...@@ -317,7 +317,7 @@ static int read_name_gen = 1;
static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt, static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt,
struct nfs_fh *src_fh, nfs4_stateid *stateid) struct nfs_fh *src_fh, nfs4_stateid *stateid)
{ {
struct nfs_fattr fattr; struct nfs_fattr *fattr = nfs_alloc_fattr();
struct file *filep, *res; struct file *filep, *res;
struct nfs_server *server; struct nfs_server *server;
struct inode *r_ino = NULL; struct inode *r_ino = NULL;
...@@ -328,9 +328,10 @@ static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt, ...@@ -328,9 +328,10 @@ static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt,
server = NFS_SERVER(ss_mnt->mnt_root->d_inode); server = NFS_SERVER(ss_mnt->mnt_root->d_inode);
nfs_fattr_init(&fattr); if (!fattr)
return ERR_PTR(-ENOMEM);
status = nfs4_proc_getattr(server, src_fh, &fattr, NULL, NULL); status = nfs4_proc_getattr(server, src_fh, fattr, NULL, NULL);
if (status < 0) { if (status < 0) {
res = ERR_PTR(status); res = ERR_PTR(status);
goto out; goto out;
...@@ -343,7 +344,7 @@ static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt, ...@@ -343,7 +344,7 @@ static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt,
goto out; goto out;
snprintf(read_name, len, SSC_READ_NAME_BODY, read_name_gen++); snprintf(read_name, len, SSC_READ_NAME_BODY, read_name_gen++);
r_ino = nfs_fhget(ss_mnt->mnt_root->d_inode->i_sb, src_fh, &fattr, r_ino = nfs_fhget(ss_mnt->mnt_root->d_inode->i_sb, src_fh, fattr,
NULL); NULL);
if (IS_ERR(r_ino)) { if (IS_ERR(r_ino)) {
res = ERR_CAST(r_ino); res = ERR_CAST(r_ino);
...@@ -388,6 +389,7 @@ static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt, ...@@ -388,6 +389,7 @@ static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt,
out_free_name: out_free_name:
kfree(read_name); kfree(read_name);
out: out:
nfs_free_fattr(fattr);
return res; return res;
out_stateowner: out_stateowner:
nfs4_put_state_owner(sp); nfs4_put_state_owner(sp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment