Messages in this thread Patch in this message | | | From | Jesper Juhl <> | Subject | Small optimization for nfs3acl. (was: Re: [PATCH] NFS: nfsaclsvc_encode_getaclres() - Fix potential NULL deref and tiny optimization.) | Date | Tue, 31 Oct 2006 21:39:23 +0100 |
| |
On Tuesday 31 October 2006 17:26, Andreas Gruenbacher wrote: > On Saturday 28 October 2006 00:01, Jesper Juhl wrote: > > > > 3) There are two locations in the function where we may return before > > > > we use the value of the variable 'w', but we compute it at the very top > > > > of the function. So in the case where we return early we have wasted a > > > > few cycles computing a value that was never used. > > Computing w later in the function is fine. > ... > > Please fix this identically in fs/nfsd/nfs2acl.c and fs/nfsd/nfs3acl.c. >
Here's a patch for nfs3. Hope it's OK.
Saves a few bytes of .text and avoids calculating 'w' in nfs3svc_encode_getaclres() in case we return before it's needed.
text data bss dec hex filename 1688 132 0 1820 71c fs/nfsd/nfs3acl.o
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> ---
fs/nfsd/nfs3acl.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c index fcad289..eb1cf22 100644 --- a/fs/nfsd/nfs3acl.c +++ b/fs/nfsd/nfs3acl.c @@ -171,11 +171,9 @@ static int nfs3svc_encode_getaclres(stru p = nfs3svc_encode_post_op_attr(rqstp, p, &resp->fh); if (resp->status == 0 && dentry && dentry->d_inode) { struct inode *inode = dentry->d_inode; - int w = nfsacl_size( - (resp->mask & NFS_ACL) ? resp->acl_access : NULL, - (resp->mask & NFS_DFACL) ? resp->acl_default : NULL); struct kvec *head = rqstp->rq_res.head; unsigned int base; + int w; int n; *p++ = htonl(resp->mask); @@ -183,6 +181,9 @@ static int nfs3svc_encode_getaclres(stru return 0; base = (char *)p - (char *)head->iov_base; + w = nfsacl_size( + (resp->mask & NFS_ACL) ? resp->acl_access : NULL, + (resp->mask & NFS_DFACL) ? resp->acl_default : NULL); rqstp->rq_res.page_len = w; while (w > 0) { if (!rqstp->rq_respages[rqstp->rq_resused++])
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |