Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 18:08:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NFSv4: Reduce stack footprint of nfs4_proc_access() and nfs3_proc_access()

Browse Source 
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2010-04-16 16:22:48 -04:00
parent 4f727296d2
commit c407d41a16
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/nfs/nfs3proc.c
View File

@ -181,13 +181,10 @@ nfs3_proc_lookup(struct inode *dir, struct qstr *name,
static int nfs3_proc_access(struct inode *inode, struct nfs_access_entry *entry) static int nfs3_proc_access(struct inode *inode, struct nfs_access_entry *entry)
{ {
struct nfs_fattr fattr;
struct nfs3_accessargs arg = { struct nfs3_accessargs arg = {
.fh = NFS_FH(inode), .fh = NFS_FH(inode),
}; };
struct nfs3_accessres res = { struct nfs3_accessres res;
.fattr = &fattr,
};
struct rpc_message msg = { struct rpc_message msg = {
.rpc_proc = &nfs3_procedures[NFS3PROC_ACCESS], .rpc_proc = &nfs3_procedures[NFS3PROC_ACCESS],
.rpc_argp = &arg, .rpc_argp = &arg,
@ -195,7 +192,7 @@ static int nfs3_proc_access(struct inode *inode, struct nfs_access_entry *entry)
.rpc_cred = entry->cred, .rpc_cred = entry->cred,
}; };
int mode = entry->mask; int mode = entry->mask;
int status; int status = -ENOMEM;
dprintk("NFS call access\n"); dprintk("NFS call access\n");
@ -212,9 +209,13 @@ static int nfs3_proc_access(struct inode *inode, struct nfs_access_entry *entry)
if (mode & MAY_EXEC) if (mode & MAY_EXEC)
arg.access |= NFS3_ACCESS_EXECUTE; arg.access |= NFS3_ACCESS_EXECUTE;
} }
nfs_fattr_init(&fattr);
res.fattr = nfs_alloc_fattr();
if (res.fattr == NULL)
goto out;
status = rpc_call_sync(NFS_CLIENT(inode), &msg, 0); status = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
nfs_refresh_inode(inode, &fattr); nfs_refresh_inode(inode, res.fattr);
if (status == 0) { if (status == 0) {
entry->mask = 0; entry->mask = 0;
if (res.access & NFS3_ACCESS_READ) if (res.access & NFS3_ACCESS_READ)
@ -224,6 +225,8 @@ static int nfs3_proc_access(struct inode *inode, struct nfs_access_entry *entry)
if (res.access & (NFS3_ACCESS_LOOKUP|NFS3_ACCESS_EXECUTE)) if (res.access & (NFS3_ACCESS_LOOKUP|NFS3_ACCESS_EXECUTE))
entry->mask |= MAY_EXEC; entry->mask |= MAY_EXEC;
} }
nfs_free_fattr(res.fattr);
out:
dprintk("NFS reply access: %d\n", status); dprintk("NFS reply access: %d\n", status);
return status; return status;
} }

11
fs/nfs/nfs4proc.c
View File

@ -2404,14 +2404,12 @@ static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh
static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry) static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry)
{ {
struct nfs_server *server = NFS_SERVER(inode); struct nfs_server *server = NFS_SERVER(inode);
struct nfs_fattr fattr;
struct nfs4_accessargs args = { struct nfs4_accessargs args = {
.fh = NFS_FH(inode), .fh = NFS_FH(inode),
.bitmask = server->attr_bitmask, .bitmask = server->attr_bitmask,
}; };
struct nfs4_accessres res = { struct nfs4_accessres res = {
.server = server, .server = server,
.fattr = &fattr,
}; };
struct rpc_message msg = { struct rpc_message msg = {
.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_ACCESS], .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_ACCESS],
@ -2438,7 +2436,11 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry
if (mode & MAY_EXEC) if (mode & MAY_EXEC)
args.access |= NFS4_ACCESS_EXECUTE; args.access |= NFS4_ACCESS_EXECUTE;
} }
nfs_fattr_init(&fattr);
res.fattr = nfs_alloc_fattr();
if (res.fattr == NULL)
return -ENOMEM;
status = nfs4_call_sync(server, &msg, &args, &res, 0); status = nfs4_call_sync(server, &msg, &args, &res, 0);
if (!status) { if (!status) {
entry->mask = 0; entry->mask = 0;
@ -2448,8 +2450,9 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry
entry->mask |= MAY_WRITE; entry->mask |= MAY_WRITE;
if (res.access & (NFS4_ACCESS_LOOKUP|NFS4_ACCESS_EXECUTE)) if (res.access & (NFS4_ACCESS_LOOKUP|NFS4_ACCESS_EXECUTE))
entry->mask |= MAY_EXEC; entry->mask |= MAY_EXEC;
nfs_refresh_inode(inode, &fattr); nfs_refresh_inode(inode, res.fattr);
} }
nfs_free_fattr(res.fattr);
return status; return status;
} }