Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 56567
b: refs/heads/master
c: 2e42c3e
h: refs/heads/master
i:
  56565: 8cee86c
  56563: 221fb3a
  56559: c15829b
v: v3
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed May 14, 2007
1 parent 221b1ec commit 2626c1c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 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: 10afec9081fee7e48995fa396fba22c7de4b99d4
refs/heads/master: 2e42c3e2aec6e24e58c4c601e1a33f0e9e36e314
4 changes: 2 additions & 2 deletions trunk/fs/nfs/callback.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ enum nfs4_callback_opnum {
};

struct cb_compound_hdr_arg {
int taglen;
unsigned int taglen;
const char *tag;
unsigned int callback_ident;
unsigned nops;
};

struct cb_compound_hdr_res {
__be32 *status;
int taglen;
unsigned int taglen;
const char *tag;
__be32 *nops;
};
Expand Down
6 changes: 3 additions & 3 deletions trunk/fs/nfs/nfs4xdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -2494,7 +2494,7 @@ static int decode_attr_fs_locations(struct xdr_stream *xdr, uint32_t *bitmap, st
int i;
dprintk("%s: using first %d of %d servers returned for location %d\n", __FUNCTION__, NFS4_FS_LOCATION_MAXSERVERS, m, res->nlocations);
for (i = loc->nservers; i < m; i++) {
int len;
unsigned int len;
char *data;
status = decode_opaque_inline(xdr, &len, &data);
if (unlikely(status != 0))
Expand Down Expand Up @@ -2642,7 +2642,7 @@ static int decode_attr_nlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t
return 0;
}

static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, int32_t *uid)
static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, uint32_t *uid)
{
uint32_t len;
__be32 *p;
Expand All @@ -2667,7 +2667,7 @@ static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, struct nf
return 0;
}

static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, int32_t *gid)
static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, uint32_t *gid)
{
uint32_t len;
__be32 *p;
Expand Down

0 comments on commit 2626c1c

Please sign in to comment.