projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] slab: remove kmem_cache_t
[powerpc.git]
/
fs
/
nfs
/
nfs4proc.c
diff --git
a/fs/nfs/nfs4proc.c
b/fs/nfs/nfs4proc.c
index
47c7e6e
..
8118036
100644
(file)
--- a/
fs/nfs/nfs4proc.c
+++ b/
fs/nfs/nfs4proc.c
@@
-138,10
+138,10
@@
const u32 nfs4_fs_locations_bitmap[2] = {
| FATTR4_WORD1_MOUNTED_ON_FILEID
};
| FATTR4_WORD1_MOUNTED_ON_FILEID
};
-static void nfs4_setup_readdir(u64 cookie,
u
32 *verifier, struct dentry *dentry,
+static void nfs4_setup_readdir(u64 cookie,
__be
32 *verifier, struct dentry *dentry,
struct nfs4_readdir_arg *readdir)
{
struct nfs4_readdir_arg *readdir)
{
-
u
32 *start, *p;
+
__be
32 *start, *p;
BUG_ON(readdir->count < 80);
if (cookie > 2) {
BUG_ON(readdir->count < 80);
if (cookie > 2) {
@@
-162,7
+162,7
@@
static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry,
* when talking to the server, we always send cookie 0
* instead of 1 or 2.
*/
* when talking to the server, we always send cookie 0
* instead of 1 or 2.
*/
- start = p =
(u32 *)
kmap_atomic(*readdir->pages, KM_USER0);
+ start = p = kmap_atomic(*readdir->pages, KM_USER0);
if (cookie == 0) {
*p++ = xdr_one; /* next */
if (cookie == 0) {
*p++ = xdr_one; /* next */
@@
-1314,11
+1314,9
@@
nfs4_open_revalidate(struct inode *dir, struct dentry *dentry, int openflags, st
case -EROFS:
lookup_instantiate_filp(nd, (struct dentry *)state, NULL);
return 1;
case -EROFS:
lookup_instantiate_filp(nd, (struct dentry *)state, NULL);
return 1;
- case -ENOENT:
- if (dentry->d_inode == NULL)
- return 1;
+ default:
+ goto out_drop;
}
}
- goto out_drop;
}
if (state->inode == dentry->d_inode) {
nfs4_intent_set_file(nd, dentry, state);
}
if (state->inode == dentry->d_inode) {
nfs4_intent_set_file(nd, dentry, state);
@@
-2917,11
+2915,11
@@
int nfs4_proc_setclientid(struct nfs_client *clp, u32 program, unsigned short po
.rpc_resp = clp,
.rpc_cred = cred,
};
.rpc_resp = clp,
.rpc_cred = cred,
};
-
u
32 *p;
+
__be
32 *p;
int loop = 0;
int status;
int loop = 0;
int status;
- p = (
u
32*)sc_verifier.data;
+ p = (
__be
32*)sc_verifier.data;
*p++ = htonl((u32)clp->cl_boot_time.tv_sec);
*p = htonl((u32)clp->cl_boot_time.tv_nsec);
*p++ = htonl((u32)clp->cl_boot_time.tv_sec);
*p = htonl((u32)clp->cl_boot_time.tv_nsec);