summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
Commit message (Collapse)AuthorAgeFilesLines
* nfsd4: merge last two setclientid casesJ. Bruce Fields2012-05-311-9/+4
| | | | | | The code here is mostly the same. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: setclientid/confirm comment cleanupJ. Bruce Fields2012-05-311-56/+11
| | | | | | Be a little more concise. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: setclientid remove unnecessary terms from a logical expressionJ. Bruce Fields2012-05-311-3/+2
| | | | Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: move rq_flavor into svc_credJ. Bruce Fields2012-05-314-9/+9
| | | | | | | Move the rq_flavor into struct svc_cred, and use it in setclientid and exchange_id comparisons as well. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: stricter cred comparison for setclientid/exchange_idJ. Bruce Fields2012-05-311-1/+21
| | | | | | | | | The typical setclientid or exchange_id will probably be performed with a credential that maps to either root or nobody, so comparing just uid's is unlikely to be useful. So, use everything else we can get our hands on. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: move principal name into svc_credJ. Bruce Fields2012-05-313-20/+20
| | | | | | | | Instead of keeping the principal name associated with a request in a structure that's private to auth_gss and using an accessor function, move it to svc_cred. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: allow removing clients not holding stateJ. Bruce Fields2012-05-311-2/+19
| | | | | | | | RFC 5661 actually says we should allow an exchange_id to remove a matching client, even if the exchange_id comes from a different principal, *if* the victim client lacks any state. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: rearrange exchange_id logic to simplifyJ. Bruce Fields2012-05-311-20/+20
| | | | | | | Minor cleanup: it's simpler to have separate code paths for the update and non-update cases. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: exchange_id cleanup: commentsJ. Bruce Fields2012-05-311-26/+10
| | | | | | Make these comments a bit more concise and uniform. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: exchange_id cleanup: local shorthands for repeated testsJ. Bruce Fields2012-05-311-6/+10
| | | | Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: allow an EXCHANGE_ID to kill a 4.0 clientJ. Bruce Fields2012-05-311-2/+8
| | | | | | | | | Following rfc 5661 section 2.4.1, we can permit a 4.1 client to remove an established 4.0 client's state. (But we don't allow updates.) Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: exchange_id: check creds before killing confirmed clientJ. Bruce Fields2012-05-311-9/+8
| | | | | | | | | | | | We mustn't allow a client to destroy another client with established state unless it has the right credential. And some minor cleanup. (Note: our comparison of credentials is actually pretty bogus currently; that will need to be fixed in another patch.) Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: exchange_id error cleanupJ. Bruce Fields2012-05-311-5/+1
| | | | | | | There's no point to the dprintk here as the main proc_compound loop already does this. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: exchange_id has a pointless copyJ. Bruce Fields2012-05-311-1/+0
| | | | | | We just verified above that these two verifiers are already the same. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: return 0 on reads of fault injection filesWeston Andros Adamson2012-05-311-0/+1
| | | | | | | debugfs read operations were returning the contents of an uninitialized u64. Signed-off-by: Weston Andros Adamson <dros@netapp.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: wrap all accesses to st_deny_bmapJeff Layton2012-05-311-8/+29
| | | | | | | | Handle the st_deny_bmap in a similar fashion to the st_access_bmap. Add accessor functions and use those instead of bare bitops. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: wrap accesses to st_access_bmapJeff Layton2012-05-311-28/+54
| | | | | | | | | | | | | | | | Currently, we do this for the most part with "bare" bitops, but eventually we'll need to expand the share mode code to handle access and deny modes on other nodes. In order to facilitate that code in the future, move to some generic accessor functions. For now, these are mostly static inlines, but eventually we'll want to move these to "real" functions that are able to handle multi-node configurations or have a way to "swap in" new operations to be done in lieu of or in conjunction with these atomic bitops. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: make test_share a bool returnJeff Layton2012-05-311-3/+3
| | | | | | | All of the callers treat the return that way already. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: consolidate set_access and set_denyJeff Layton2012-05-311-17/+7
| | | | | | | | | These functions are identical. Also, rename them to bmap_to_share_mode to better reflect what they do, and have them just return the result instead of passing in a pointer to the storage location. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* NFSD: SETCLIENTID_CONFIRM returns NFS4ERR_CLID_INUSE too oftenChuck Lever2012-05-311-12/+2
| | | | | | | | | | | | | | | According to RFC 3530bis, the only items SETCLIENTID_CONFIRM processing should be concerned with is the clientid, clientid verifier, and principal. The client's IP address is not supposed to be interesting. And, NFS4ERR_CLID_INUSE is meant only for principal mismatches. I triggered this logic with a prototype UCS client -- one that uses the same nfs_client_id4 string for all servers. The client mounted our server via its IPv4, then via its IPv6 address. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* SUNRPC: move per-net operations from svc_destroy()Stanislav Kinsbursky2012-05-312-3/+23
| | | | | | | | | | | | | | | | The idea is to separate service destruction and per-net operations, because these are two different things and the mix looks ugly. Notes: 1) For NFS server this patch looks ugly (sorry for that). But these place will be rewritten soon during NFSd containerization. 2) LockD per-net counter increase int lockd_up() was moved prior to make_socks() to make lockd_down_net() call safe in case of error. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* SUNRPC: new svc_bind() routine introducedStanislav Kinsbursky2012-05-311-0/+9
| | | | | | | | | | | | | | | This new routine is responsible for service registration in a specified network context. The idea is to separate service creation from per-net operations. Note also: since registering service with svc_bind() can fail, the service will be destroyed and during destruction it will try to unregister itself from rpcbind. In this case unregistration has to be skipped. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: add IPv6 addr escaping to fs_location hostsWeston Andros Adamson2012-05-311-7/+33
| | | | | | | | | | | | The fs_location->hosts list is split on colons, but this doesn't work when IPv6 addresses are used (they contain colons). This patch adds the function nfsd4_encode_components_esc() to allow the caller to specify escape characters when splitting on 'sep'. In order to fix referrals, this patch must be used with the mountd patch that similarly fixes IPv6 [] escaping. Signed-off-by: Weston Andros Adamson <dros@netapp.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: fix change attribute endiannessJ. Bruce Fields2012-05-311-2/+2
| | | | | | | Though actually this doesn't matter much, as NFSv4.0 clients are required to treat the change attribute as opaque. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: fix free_stateid return endiannessJ. Bruce Fields2012-05-311-2/+2
| | | | | Cc: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: int/__be32 fixesJ. Bruce Fields2012-05-313-20/+20
| | | | | | | In each of these cases there's a simple unambiguous correct choice, and no actual bug. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: preserve __user annotation on cld downcall msgJ. Bruce Fields2012-05-311-1/+1
| | | | | Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd4: fix missing "static"J. Bruce Fields2012-05-314-4/+4
| | | | Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: state.c should include current_stateid.hJ. Bruce Fields2012-05-311-0/+1
| | | | | | OK, admittedly I'm mainly just trying to shut sparse up. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: trivial: use SEEK_SET instead of 0 in vfs_llseekJeff Layton2012-04-251-1/+1
| | | | | | | | They're equivalent, but SEEK_SET is more informative... Cc: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: allocate id-to-name and name-to-id caches in per-net operations.Stanislav Kinsbursky2012-04-121-7/+7
| | | | | Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: make name-to-id cache allocated per network namespace contextStanislav Kinsbursky2012-04-122-10/+16
| | | | | Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: make id-to-name cache allocated per network namespace contextStanislav Kinsbursky2012-04-122-10/+26
| | | | | Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: pass network context to idmap init/exit functionsStanislav Kinsbursky2012-04-123-14/+14
| | | | | | | These functions will be called from per-net operations. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: allocate export and expkey caches in per-net operations.Stanislav Kinsbursky2012-04-121-6/+21
| | | | | Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: make expkey cache allocated per network namespace contextStanislav Kinsbursky2012-04-123-12/+20
| | | | | | | | | This patch also changes svcauth_unix_purge() function: added network namespace as a parameter and thus loop over all networks was replaced by only one call for ip map cache purge. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: make export cache allocated per network namespace contextStanislav Kinsbursky2012-04-124-17/+36
| | | | | | | | This patch also changes prototypes of nfsd_export_flush() and exp_rootfh(): network namespace parameter added. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: pass pointer to export cache down to stack wherever possible.Stanislav Kinsbursky2012-04-121-15/+22
| | | | | | | | | This cache will be per-net soon. And it's easier to get the pointer to desired per-net instance only once and then pass it down instead of discovering it in every place were required. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: pass network context to export caches init/shutdown routinesStanislav Kinsbursky2012-04-112-13/+13
| | | | | | | These functions will be called from per-net operations. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* Lockd: pass network namespace to creation and destruction routinesStanislav Kinsbursky2012-04-111-3/+3
| | | | | | | | | | | | | v2: dereference of most probably already released nlm_host removed in nlmclnt_done() and reclaimer(). These routines are called from locks reclaimer() kernel thread. This thread works in "init_net" network context and currently relays on persence on lockd thread and it's per-net resources. Thus lockd_up() and lockd_down() can't relay on current network context. So let's pass corrent one into them. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* NFSd: remove hard-coded dereferences to name-to-id and id-to-name cachesStanislav Kinsbursky2012-04-111-26/+24
| | | | | | | | | These dereferences to global static caches are redundant. They also prevents converting these caches into per-net ones. So this patch is cleanup + precursor of patch set,a which will make them per-net. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: pass pointer to expkey cache down to stack wherever possible.Stanislav Kinsbursky2012-04-111-16/+16
| | | | | | | | | This cache will be per-net soon. And it's easier to get the pointer to desired per-net instance only once and then pass it down instead of discovering it in every place were required. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: use hash table from cache detail in nfsd export seq opsStanislav Kinsbursky2012-04-111-0/+3
| | | | | | | Hard-code is redundant and will prevent from making caches per net ns. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: pass svc_export_cache pointer as private data to "exports" seq file opsStanislav Kinsbursky2012-04-112-8/+21
| | | | | | | | Global svc_export_cache cache is going to be replaced with per-net instance. So prepare the ground for it. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: use exp_put() for svc_export_cache putStanislav Kinsbursky2012-04-112-2/+2
| | | | | | | This patch replaces cache_put() call for svc_export_cache by exp_put() call. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: add link to owner cache detail to svc_export structureStanislav Kinsbursky2012-04-111-5/+5
| | | | | | | | Without info about owner cache datail it won't be able to find out, which per-net cache detail have to be. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: use passed cache_detail pointer expkey_parse()Stanislav Kinsbursky2012-04-111-1/+1
| | | | | | | | Using of hard-coded svc_expkey_cache pointer in expkey_parse() looks redundant. Moreover, global cache will be replaced with per-net instance soon. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: don't use locks_in_grace to determine whether to call nfs4_grace_endJeff Layton2012-04-111-2/+9
| | | | | | | | | | | | | | | It's possible that lockd or another lock manager might still be on the list after we call nfsd4_end_grace. If the laundromat thread runs again at that point, then we could end up calling nfsd4_end_grace more than once. That's not only inefficient, but calling nfsd4_recdir_purge_old more than once could be problematic. Fix this by adding a new global "grace_ended" flag and use that to determine whether we've already called nfsd4_grace_end. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: trivial: remove unused variable from nfsd4_lockJeff Layton2012-04-111-2/+0
| | | | | | | ..."fp" is set but never used. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
* nfsd: don't fail unchecked creates of non-special filesJ. Bruce Fields2012-04-112-5/+5
| | | | | | | | | | | | | | | | | | | | | | Allow a v3 unchecked open of a non-regular file succeed as if it were a lookup; typically a client in such a case will want to fall back on a local open, so succeeding and giving it the filehandle is more useful than failing with nfserr_exist, which makes it appear that nothing at all exists by that name. Similarly for v4, on an open-create, return the same errors we would on an attempt to open a non-regular file, instead of returning nfserr_exist. This fixes a problem found doing a v4 open of a symlink with O_RDONLY|O_CREAT, which resulted in the current client returning EEXIST. Thanks also to Trond for analysis. Cc: stable@kernel.org Reported-by: Orion Poplawski <orion@cora.nwra.com> Tested-by: Orion Poplawski <orion@cora.nwra.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
OpenPOWER on IntegriCloud