Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 2787
b: refs/heads/master
c: 2134842
h: refs/heads/master
i:
  2785: 6c3434f
  2783: 4891d46
v: v3
  • Loading branch information
Andreas Gruenbacher authored and Trond Myklebust committed Jun 22, 2005
1 parent acf54dd commit 685b483
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 458818ed76d3f495f9f32373c936456c9427f759
refs/heads/master: 213484254c65e3c39c59df454132748b1367f816
2 changes: 1 addition & 1 deletion trunk/fs/nfs/nfs3xdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ nfs3_xdr_setaclargs(struct rpc_rqst *req, u32 *p,
/* put as much of the acls into head as possible. */
len_in_head = min_t(unsigned int, buf->head->iov_len - base, len);
len -= len_in_head;
req->rq_slen = xdr_adjust_iovec(req->rq_svec, p + len_in_head);
req->rq_slen = xdr_adjust_iovec(req->rq_svec, p + (len_in_head >> 2));

for (count = 0; (count << PAGE_SHIFT) < len; count++) {
args->pages[count] = alloc_page(GFP_KERNEL);
Expand Down
1 change: 1 addition & 0 deletions trunk/fs/nfsd/nfssvc.c
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ static struct svc_program nfsd_acl_program = {
.pg_nvers = NFSD_ACL_NRVERS,
.pg_vers = nfsd_acl_version,
.pg_name = "nfsd",
.pg_class = "nfsd",
.pg_stats = &nfsd_acl_svcstats,
};

Expand Down

0 comments on commit 685b483

Please sign in to comment.