git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
afs
/
fsclient.c
diff --git
a/fs/afs/fsclient.c
b/fs/afs/fsclient.c
index
911496e
..
c88c41a
100644
(file)
--- a/
fs/afs/fsclient.c
+++ b/
fs/afs/fsclient.c
@@
-59,7
+59,7
@@
int afs_rxfs_get_root_volume(struct afs_server *server,
{
struct rxrpc_connection *conn;
struct rxrpc_call *call;
{
struct rxrpc_connection *conn;
struct rxrpc_call *call;
- struct
io
vec piov[2];
+ struct
k
vec piov[2];
size_t sent;
int ret;
u32 param[1];
size_t sent;
int ret;
u32 param[1];
@@
-189,7
+189,7
@@
int afs_rxfs_get_volume_info(struct afs_server *server,
{
struct rxrpc_connection *conn;
struct rxrpc_call *call;
{
struct rxrpc_connection *conn;
struct rxrpc_call *call;
- struct
io
vec piov[3];
+ struct
k
vec piov[3];
size_t sent;
int ret;
u32 param[2], *bp, zero;
size_t sent;
int ret;
u32 param[2], *bp, zero;
@@
-304,10
+304,10
@@
int afs_rxfs_fetch_file_status(struct afs_server *server,
{
struct afs_server_callslot callslot;
struct rxrpc_call *call;
{
struct afs_server_callslot callslot;
struct rxrpc_call *call;
- struct
io
vec piov[1];
+ struct
k
vec piov[1];
size_t sent;
int ret;
size_t sent;
int ret;
-
u
32 *bp;
+
__be
32 *bp;
DECLARE_WAITQUEUE(myself, current);
DECLARE_WAITQUEUE(myself, current);
@@
-398,6
+398,8
@@
int afs_rxfs_fetch_file_status(struct afs_server *server,
bp++; /* spare6 */
}
bp++; /* spare6 */
}
+ _debug("Data Version %llx\n", vnode->status.version);
+
/* success */
ret = 0;
/* success */
ret = 0;
@@
-408,7
+410,7
@@
int afs_rxfs_fetch_file_status(struct afs_server *server,
out_put_conn:
afs_server_release_callslot(server, &callslot);
out:
out_put_conn:
afs_server_release_callslot(server, &callslot);
out:
- _leave("
"
);
+ _leave("
= %d", ret
);
return ret;
abort:
return ret;
abort:
@@
-429,10
+431,10
@@
int afs_rxfs_fetch_file_data(struct afs_server *server,
{
struct afs_server_callslot callslot;
struct rxrpc_call *call;
{
struct afs_server_callslot callslot;
struct rxrpc_call *call;
- struct
io
vec piov[1];
+ struct
k
vec piov[1];
size_t sent;
int ret;
size_t sent;
int ret;
-
u
32 *bp;
+
__be
32 *bp;
DECLARE_WAITQUEUE(myself, current);
DECLARE_WAITQUEUE(myself, current);
@@
-580,10
+582,10
@@
int afs_rxfs_give_up_callback(struct afs_server *server,
{
struct afs_server_callslot callslot;
struct rxrpc_call *call;
{
struct afs_server_callslot callslot;
struct rxrpc_call *call;
- struct
io
vec piov[1];
+ struct
k
vec piov[1];
size_t sent;
int ret;
size_t sent;
int ret;
-
u
32 *bp;
+
__be
32 *bp;
DECLARE_WAITQUEUE(myself, current);
DECLARE_WAITQUEUE(myself, current);
@@
-686,7
+688,7
@@
int afs_rxfs_lookup(struct afs_server *server,
{
struct rxrpc_connection *conn;
struct rxrpc_call *call;
{
struct rxrpc_connection *conn;
struct rxrpc_call *call;
- struct
io
vec piov[3];
+ struct
k
vec piov[3];
size_t sent;
int ret;
u32 *bp, zero;
size_t sent;
int ret;
u32 *bp, zero;