The patch titled
NFS3: Calculate 'w' a bit later in nfs3svc_encode_getaclres()
has been added to the -mm tree. Its filename is
nfs3-calculate-w-a-bit-later-in-nfs3svc_encode_getaclres.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: NFS3: Calculate 'w' a bit later in nfs3svc_encode_getaclres()
From: Jesper Juhl <jesper.juhl@xxxxxxxxx>
NFS3: Calculate 'w' a bit later in nfs3svc_encode_getaclres()
This is a small performance optimization since we can return before
needing 'w'. It also saves a few bytes of .text :
Before:
text data bss dec hex filename
1632 140 0 1772 6ec fs/nfsd/nfs3acl.o
After:
text data bss dec hex filename
1624 140 0 1764 6e4 fs/nfsd/nfs3acl.o
Signed-off-by: Jesper Juhl <jesper.juhl@xxxxxxxxx>
Cc: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfsd/nfs3acl.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff -puN fs/nfsd/nfs3acl.c~nfs3-calculate-w-a-bit-later-in-nfs3svc_encode_getaclres fs/nfsd/nfs3acl.c
--- a/fs/nfsd/nfs3acl.c~nfs3-calculate-w-a-bit-later-in-nfs3svc_encode_getaclres
+++ a/fs/nfsd/nfs3acl.c
@@ -171,19 +171,19 @@ 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 n;
+ int w;
*p++ = htonl(resp->mask);
if (!xdr_ressize_check(rqstp, p))
return 0;
base = (char *)p - (char *)head->iov_base;
- rqstp->rq_res.page_len = w;
+ rqstp->rq_res.page_len = w = nfsacl_size(
+ (resp->mask & NFS_ACL) ? resp->acl_access : NULL,
+ (resp->mask & NFS_DFACL) ? resp->acl_default : NULL);
while (w > 0) {
if (!rqstp->rq_respages[rqstp->rq_resused++])
return 0;
_
Patches currently in -mm which might be from jesper.juhl@xxxxxxxxx are
git-acpi.patch
nfs-kill-obsolete-nfs_paranoia.patch
isdn-avoid-a-potential-null-ptr-deref-in-ippp.patch
nfs2-calculate-w-a-bit-later-in-nfsaclsvc_encode_getaclres.patch
nfs3-calculate-w-a-bit-later-in-nfs3svc_encode_getaclres.patch
video-sis-remove-unnecessary-variables-in-sis_ddc2delay.patch
debug-shared-irqs.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
