Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson
parent
1a1093ae2f
commit
3b1318570e
|
|
@ -23,7 +23,7 @@ Summary: The Linux kernel
|
|||
#
|
||||
# (Uncomment the '#' and both spaces below to set the buildid.)
|
||||
#
|
||||
%define buildid .pnfs34.2010.08.19
|
||||
%define buildid .pnfs_all_2.6.35_2010_08_19
|
||||
###################################################################
|
||||
|
||||
# The buildid can also be specified on the rpmbuild command line
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
diff -up linux-2.6.34.noarch/Documentation/filesystems/nfs/nfs41-server.txt.orig linux-2.6.34.noarch/Documentation/filesystems/nfs/nfs41-server.txt
|
||||
--- linux-2.6.34.noarch/Documentation/filesystems/nfs/nfs41-server.txt.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
<<<<<<< HEAD
|
||||
+++ linux-2.6.34.noarch/Documentation/filesystems/nfs/nfs41-server.txt 2010-08-23 14:12:24.165356789 -0400
|
||||
=======
|
||||
+++ linux-2.6.34.noarch/Documentation/filesystems/nfs/nfs41-server.txt 2010-08-23 09:57:18.233564439 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -137,7 +137,7 @@ NS*| OPENATTR | OPT |
|
||||
| READ | REQ | | Section 18.22 |
|
||||
| READDIR | REQ | | Section 18.23 |
|
||||
|
|
@ -12,7 +16,11 @@ diff -up linux-2.6.34.noarch/Documentation/filesystems/nfs/nfs41-server.txt.orig
|
|||
| RENAME | REQ | | Section 18.26 |
|
||||
diff -up linux-2.6.34.noarch/fs/nfsd/export.c.orig linux-2.6.34.noarch/fs/nfsd/export.c
|
||||
--- linux-2.6.34.noarch/fs/nfsd/export.c.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
<<<<<<< HEAD
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/export.c 2010-08-23 14:12:24.519356675 -0400
|
||||
=======
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/export.c 2010-08-23 09:57:18.234564075 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -259,10 +259,9 @@ static struct cache_detail svc_expkey_ca
|
||||
.alloc = expkey_alloc,
|
||||
};
|
||||
|
|
@ -108,7 +116,11 @@ diff -up linux-2.6.34.noarch/fs/nfsd/export.c.orig linux-2.6.34.noarch/fs/nfsd/e
|
|||
out_put_clp:
|
||||
diff -up linux-2.6.34.noarch/fs/nfsd/nfs4callback.c.orig linux-2.6.34.noarch/fs/nfsd/nfs4callback.c
|
||||
--- linux-2.6.34.noarch/fs/nfsd/nfs4callback.c.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
<<<<<<< HEAD
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/nfs4callback.c 2010-08-23 14:12:52.625429773 -0400
|
||||
=======
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/nfs4callback.c 2010-08-23 10:00:37.257414684 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -79,11 +79,6 @@ enum nfs_cb_opnum4 {
|
||||
cb_sequence_dec_sz + \
|
||||
op_dec_sz)
|
||||
|
|
@ -211,7 +223,11 @@ diff -up linux-2.6.34.noarch/fs/nfsd/nfs4callback.c.orig linux-2.6.34.noarch/fs/
|
|||
int status;
|
||||
|
||||
- status = rpc_call_async(cb->cb_client, &msg,
|
||||
<<<<<<< HEAD
|
||||
+ status = rpc_call_async(clp->cl_cb_client, &msg,
|
||||
=======
|
||||
+ status = rpc_call_async(cb->cl_cb_client, &msg,
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
RPC_TASK_SOFT | RPC_TASK_SOFTCONN,
|
||||
&nfsd4_cb_probe_ops, (void *)clp);
|
||||
- if (status) {
|
||||
|
|
@ -402,7 +418,11 @@ diff -up linux-2.6.34.noarch/fs/nfsd/nfs4callback.c.orig linux-2.6.34.noarch/fs/
|
|||
}
|
||||
diff -up linux-2.6.34.noarch/fs/nfsd/nfs4proc.c.orig linux-2.6.34.noarch/fs/nfsd/nfs4proc.c
|
||||
--- linux-2.6.34.noarch/fs/nfsd/nfs4proc.c.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
<<<<<<< HEAD
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/nfs4proc.c 2010-08-23 14:12:25.698356909 -0400
|
||||
=======
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/nfs4proc.c 2010-08-23 09:57:18.237376763 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -969,20 +969,36 @@ static struct nfsd4_operation nfsd4_ops[
|
||||
static const char *nfsd4_op_name(unsigned opnum);
|
||||
|
||||
|
|
@ -490,7 +510,11 @@ diff -up linux-2.6.34.noarch/fs/nfsd/nfs4proc.c.orig linux-2.6.34.noarch/fs/nfsd
|
|||
static const char *nfsd4_op_name(unsigned opnum)
|
||||
diff -up linux-2.6.34.noarch/fs/nfsd/nfs4state.c.orig linux-2.6.34.noarch/fs/nfsd/nfs4state.c
|
||||
--- linux-2.6.34.noarch/fs/nfsd/nfs4state.c.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
<<<<<<< HEAD
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/nfs4state.c 2010-08-23 14:12:25.700356284 -0400
|
||||
=======
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/nfs4state.c 2010-08-23 09:57:18.240356512 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -45,8 +45,8 @@
|
||||
#define NFSDDBG_FACILITY NFSDDBG_PROC
|
||||
|
||||
|
|
@ -1280,6 +1304,7 @@ diff -up linux-2.6.34.noarch/fs/nfsd/nfs4state.c.orig linux-2.6.34.noarch/fs/nfs
|
|||
-{
|
||||
- user_lease_time = leasetime;
|
||||
-}
|
||||
<<<<<<< HEAD
|
||||
diff -up linux-2.6.34.noarch/fs/nfsd/nfs4xdr.c.orig linux-2.6.34.noarch/fs/nfsd/nfs4xdr.c
|
||||
--- linux-2.6.34.noarch/fs/nfsd/nfs4xdr.c.orig 2010-08-23 14:14:22.882428704 -0400
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/nfs4xdr.c 2010-08-23 14:14:33.418376589 -0400
|
||||
|
|
@ -1295,6 +1320,11 @@ diff -up linux-2.6.34.noarch/fs/nfsd/nfs4xdr.c.orig linux-2.6.34.noarch/fs/nfsd/
|
|||
diff -up linux-2.6.34.noarch/fs/nfsd/nfsctl.c.orig linux-2.6.34.noarch/fs/nfsd/nfsctl.c
|
||||
--- linux-2.6.34.noarch/fs/nfsd/nfsctl.c.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/nfsctl.c 2010-08-23 14:12:25.821359224 -0400
|
||||
=======
|
||||
diff -up linux-2.6.34.noarch/fs/nfsd/nfsctl.c.orig linux-2.6.34.noarch/fs/nfsd/nfsctl.c
|
||||
--- linux-2.6.34.noarch/fs/nfsd/nfsctl.c.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/nfsctl.c 2010-08-23 09:57:20.629370282 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -46,6 +46,7 @@ enum {
|
||||
*/
|
||||
#ifdef CONFIG_NFSD_V4
|
||||
|
|
@ -1415,7 +1445,11 @@ diff -up linux-2.6.34.noarch/fs/nfsd/nfsctl.c.orig linux-2.6.34.noarch/fs/nfsd/n
|
|||
/* last one */ {""}
|
||||
diff -up linux-2.6.34.noarch/fs/nfsd/nfsd.h.orig linux-2.6.34.noarch/fs/nfsd/nfsd.h
|
||||
--- linux-2.6.34.noarch/fs/nfsd/nfsd.h.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
<<<<<<< HEAD
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/nfsd.h 2010-08-23 14:12:25.835418441 -0400
|
||||
=======
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/nfsd.h 2010-08-23 09:57:20.629370282 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -82,7 +82,6 @@ int nfs4_state_init(void);
|
||||
void nfsd4_free_slabs(void);
|
||||
int nfs4_state_start(void);
|
||||
|
|
@ -1452,7 +1486,11 @@ diff -up linux-2.6.34.noarch/fs/nfsd/nfsd.h.orig linux-2.6.34.noarch/fs/nfsd/nfs
|
|||
/*
|
||||
diff -up linux-2.6.34.noarch/fs/nfsd/state.h.orig linux-2.6.34.noarch/fs/nfsd/state.h
|
||||
--- linux-2.6.34.noarch/fs/nfsd/state.h.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
<<<<<<< HEAD
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/state.h 2010-08-23 14:12:25.836366516 -0400
|
||||
=======
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/state.h 2010-08-23 09:57:21.807501619 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -70,6 +70,16 @@ struct nfsd4_cb_sequence {
|
||||
struct nfs4_client *cbs_clp;
|
||||
};
|
||||
|
|
@ -1570,7 +1608,11 @@ diff -up linux-2.6.34.noarch/fs/nfsd/state.h.orig linux-2.6.34.noarch/fs/nfsd/st
|
|||
nfs4_put_stateowner(struct nfs4_stateowner *so)
|
||||
diff -up linux-2.6.34.noarch/fs/nfsd/xdr4.h.orig linux-2.6.34.noarch/fs/nfsd/xdr4.h
|
||||
--- linux-2.6.34.noarch/fs/nfsd/xdr4.h.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
<<<<<<< HEAD
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/xdr4.h 2010-08-23 14:12:25.837387292 -0400
|
||||
=======
|
||||
+++ linux-2.6.34.noarch/fs/nfsd/xdr4.h 2010-08-23 09:57:23.994379831 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -381,6 +381,10 @@ struct nfsd4_destroy_session {
|
||||
struct nfs4_sessionid sessionid;
|
||||
};
|
||||
|
|
@ -1612,7 +1654,11 @@ diff -up linux-2.6.34.noarch/fs/nfsd/xdr4.h.orig linux-2.6.34.noarch/fs/nfsd/xdr
|
|||
extern __be32 nfsd4_process_open2(struct svc_rqst *rqstp,
|
||||
diff -up linux-2.6.34.noarch/include/linux/nfsd/nfsfh.h.orig linux-2.6.34.noarch/include/linux/nfsd/nfsfh.h
|
||||
--- linux-2.6.34.noarch/include/linux/nfsd/nfsfh.h.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
<<<<<<< HEAD
|
||||
+++ linux-2.6.34.noarch/include/linux/nfsd/nfsfh.h 2010-08-23 14:12:25.838377224 -0400
|
||||
=======
|
||||
+++ linux-2.6.34.noarch/include/linux/nfsd/nfsfh.h 2010-08-23 09:57:23.994379831 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -40,12 +40,12 @@ struct nfs_fhbase_old {
|
||||
* This is the new flexible, extensible style NFSv2/v3 file handle.
|
||||
* by Neil Brown <neilb@cse.unsw.edu.au> - March 2000
|
||||
|
|
@ -1631,7 +1677,11 @@ diff -up linux-2.6.34.noarch/include/linux/nfsd/nfsfh.h.orig linux-2.6.34.noarch
|
|||
* This might allow a file to be confirmed to be in a writable part of a
|
||||
diff -up linux-2.6.34.noarch/net/sunrpc/cache.c.orig linux-2.6.34.noarch/net/sunrpc/cache.c
|
||||
--- linux-2.6.34.noarch/net/sunrpc/cache.c.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
<<<<<<< HEAD
|
||||
+++ linux-2.6.34.noarch/net/sunrpc/cache.c 2010-08-23 14:12:25.839376838 -0400
|
||||
=======
|
||||
+++ linux-2.6.34.noarch/net/sunrpc/cache.c 2010-08-23 09:57:23.995376793 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -49,11 +49,17 @@ static void cache_init(struct cache_head
|
||||
h->last_refresh = now;
|
||||
}
|
||||
|
|
@ -1698,7 +1748,11 @@ diff -up linux-2.6.34.noarch/net/sunrpc/cache.c.orig linux-2.6.34.noarch/net/sun
|
|||
/* entry is valid */
|
||||
diff -up linux-2.6.34.noarch/net/sunrpc/svcsock.c.orig linux-2.6.34.noarch/net/sunrpc/svcsock.c
|
||||
--- linux-2.6.34.noarch/net/sunrpc/svcsock.c.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
<<<<<<< HEAD
|
||||
+++ linux-2.6.34.noarch/net/sunrpc/svcsock.c 2010-08-23 14:12:25.840384371 -0400
|
||||
=======
|
||||
+++ linux-2.6.34.noarch/net/sunrpc/svcsock.c 2010-08-23 09:57:23.997368707 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -547,7 +547,6 @@ static int svc_udp_recvfrom(struct svc_r
|
||||
dprintk("svc: recvfrom returned error %d\n", -err);
|
||||
set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
|
||||
|
|
@ -1765,7 +1819,11 @@ diff -up linux-2.6.34.noarch/net/sunrpc/svcsock.c.orig linux-2.6.34.noarch/net/s
|
|||
error:
|
||||
diff -up linux-2.6.34.noarch/net/sunrpc/svc_xprt.c.orig linux-2.6.34.noarch/net/sunrpc/svc_xprt.c
|
||||
--- linux-2.6.34.noarch/net/sunrpc/svc_xprt.c.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
<<<<<<< HEAD
|
||||
+++ linux-2.6.34.noarch/net/sunrpc/svc_xprt.c 2010-08-23 14:12:25.841371223 -0400
|
||||
=======
|
||||
+++ linux-2.6.34.noarch/net/sunrpc/svc_xprt.c 2010-08-23 09:57:23.996377209 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -744,8 +744,10 @@ int svc_recv(struct svc_rqst *rqstp, lon
|
||||
if (rqstp->rq_deferred) {
|
||||
svc_xprt_received(xprt);
|
||||
|
|
@ -1794,7 +1852,11 @@ diff -up linux-2.6.34.noarch/net/sunrpc/svc_xprt.c.orig linux-2.6.34.noarch/net/
|
|||
void svc_close_xprt(struct svc_xprt *xprt)
|
||||
diff -up linux-2.6.34.noarch/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c.orig linux-2.6.34.noarch/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
|
||||
--- linux-2.6.34.noarch/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c.orig 2010-05-16 17:17:36.000000000 -0400
|
||||
<<<<<<< HEAD
|
||||
+++ linux-2.6.34.noarch/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2010-08-23 14:12:25.842376584 -0400
|
||||
=======
|
||||
+++ linux-2.6.34.noarch/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2010-08-23 09:57:23.998377481 -0400
|
||||
>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
@@ -566,7 +566,6 @@ static int rdma_read_complete(struct svc
|
||||
ret, rqstp->rq_arg.len, rqstp->rq_arg.head[0].iov_base,
|
||||
rqstp->rq_arg.head[0].iov_len);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue