From 6df08189ffd33d8357759561dba49d25c0335858 Mon Sep 17 00:00:00 2001 From: Andy Adamson Date: Fri, 4 Dec 2009 15:55:05 -0500 Subject: nfs41: rename cl_state session SETUP bit to RESET The bit is no longer used for session setup, only for session reset. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust --- fs/nfs/nfs4state.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'fs/nfs/nfs4state.c') diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 967fc76a2463..902d8749bde4 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1092,7 +1092,7 @@ static int nfs4_recovery_handle_error(struct nfs_client *clp, int error) case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: case -NFS4ERR_SEQ_FALSE_RETRY: case -NFS4ERR_SEQ_MISORDERED: - set_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state); + set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state); } return error; } @@ -1256,7 +1256,7 @@ static void nfs4_state_manager(struct nfs_client *clp) } /* Initialize or reset the session */ - if (test_and_clear_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state) + if (test_and_clear_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state) && nfs4_has_session(clp)) { status = nfs4_reset_session(clp); if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) @@ -1270,7 +1270,7 @@ static void nfs4_state_manager(struct nfs_client *clp) status = nfs4_do_reclaim(clp, nfs4_reboot_recovery_ops[clp->cl_minorversion]); if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) || - test_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state)) + test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state)) continue; nfs4_state_end_reclaim_reboot(clp); if (test_bit(NFS4CLNT_RECLAIM_NOGRACE, &clp->cl_state)) @@ -1284,7 +1284,7 @@ static void nfs4_state_manager(struct nfs_client *clp) status = nfs4_do_reclaim(clp, nfs4_nograce_recovery_ops[clp->cl_minorversion]); if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) || - test_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state) || + test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state) || test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state)) continue; if (status < 0) -- cgit v1.2.3 fed59bb89adba3369094ebd428b930b'>refslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fixes.b8' of git://git.kernel.org/pub/scm/linux/kernel/git/viro...Linus Torvalds2006-02-201-1/+1
|\
| * [PATCH] missing ntohs() in ip6_tunnelAl Viro2006-02-181-1/+1
* | [NET]: NETFILTER: remove duplicated lines and fix order in skb_clone().YOSHIFUJI Hideaki2006-02-191-7/+3
* | [NETFILTER]: Fix outgoing redirects to loopbackPatrick McHardy2006-02-191-11/+5
* | [NETFILTER]: Fix NAT PMTUD problemsPatrick McHardy2006-02-191-9/+9
* | [XFRM]: Fix policy double putPatrick McHardy2006-02-191-2/+0
|/
* [NETFILTER]: nf_conntrack: Fix TCP/UDP HW checksum handling for IPv6 packetYasuyuki Kozakai2006-02-152-2/+6
* [NETFILTER]: nf_conntrack: attach conntrack to locally generated ICMPv6 errorYasuyuki Kozakai2006-02-151-0/+6
* [NETFILTER]: nf_conntrack: attach conntrack to TCP RST generated by ip6t_REJECTYasuyuki Kozakai2006-02-151-0/+2
* [NETFILTER]: nf_conntrack: move registration of __nf_ct_attachYasuyuki Kozakai2006-02-152-5/+5
* [NETFILTER]: x_tables: fix dependencies of conntrack related modulesYasuyuki Kozakai2006-02-151-3/+3
* [XFRM]: Fix SNAT-related crash in xfrm4_output_finishPatrick McHardy2006-02-154-11/+24
* [BRIDGE]: Fix deadlock in br_stp_disable_bridgeAdrian Drzewiecki2006-02-151-2/+2
* [NETFILTER]: Fix xfrm lookup after SNATPatrick McHardy2006-02-152-3/+44
* [NET]: Revert skb_copy_datagram_iovec() recursion elimination.David S. Miller2006-02-131-28/+53
* [IPSEC]: Fix strange IPsec freeze.Herbert Xu2006-02-131-1/+3
* [IPV6] Don't store dst_entry for RAW socketNicolas DICHTEL2006-02-131-4/+1
* [NETLINK] genetlink: Fix bugs spotted by Andrew Morton.Jamal Hadi Salim2006-02-131-7/+4
* [BRIDGE]: Better fix for netfilter missing symbol has_bridge_parentStephen Hemminger2006-02-131-2/+2
* [NETFILTER] Fix Kconfig menu level for x_tablesHarald Welte2006-02-131-2/+2
* Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6David S. Miller2006-02-132-6/+17
|\
| * [Bluetooth] Fix NULL pointer dereferences of the HCI socketMarcel Holtmann2006-02-131-2/+8
| * [Bluetooth] Reduce L2CAP MTU for RFCOMM connectionsMarcel Holtmann2006-02-131-4/+9
* | [P8023]: Fix tainting of kernel.Dave Jones2006-02-131-0/+2
* | [IPV4] ICMP: Invert default for invalid icmp msgs sysctlDave Jones2006-02-131-1/+1
* | [ATM]: Ratelimit atmsvc failure messagesDave Jones2006-02-131-1/+2
|/
* [PATCH] netfilter: fix build error due to missing has_bridge_parent macroJesper Juhl2006-02-121-1/+1
* [BRIDGE]: fix error handling for add interface to bridgeStephen Hemminger2006-02-093-73/+59
* [BRIDGE]: netfilter handle RCU during removalStephen Hemminger2006-02-091-15/+38
* [BRIDGE]: fix for RCU and deadlock on device removalStephen Hemminger2006-02-094-30/+41
* [TCP]: rcvbuf lock when tcp_moderate_rcvbuf enabledJohn Heffner2006-02-091-1/+2
* [IRDA]: out of range array access David Binderman2006-02-091-1/+1
* [IRDA]: Set proper IrLAP device address lengthSamuel Ortiz2006-02-091-2/+2
* [NETLINK]: illegal use of pid in rtnetlinkAlexey Kuznetsov2006-02-093-3/+3
* [NETLINK]: Fix a severe bugAlexey Kuznetsov2006-02-09