14 May, 2010
1 commit
-
This is a mandatory operation. Also, here (not in open) is where we
should be committing the reboot recovery information.Signed-off-by: J. Bruce Fields
04 May, 2010
1 commit
-
Conflicts:
fs/nfsd/nfs4callback.c
03 May, 2010
1 commit
-
In the replay case, the
renew_client(session->se_client);
happens after we've droppped the sessionid_lock, and without holding a
reference on the session; so there's nothing preventing the session
being freed before we get here.Thanks to Benny Halevy for catching a bug in an earlier version of this
patch.Signed-off-by: J. Bruce Fields
Acked-by: Benny Halevy
22 Apr, 2010
1 commit
-
Enforce the rules about compound op ordering.
Motivated by implementing RECLAIM_COMPLETE, for which the client is
implicit in the current session, so it is important to ensure a
succesful SEQUENCE proceeds the RECLAIM_COMPLETE.Signed-off-by: J. Bruce Fields
30 Mar, 2010
1 commit
-
…it slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
16 Dec, 2009
1 commit
-
The new .h files have paths at the top that are now out of date. While
we're here, just remove all of those from fs/nfsd; they never served any
purpose.Signed-off-by: J. Bruce Fields
15 Dec, 2009
3 commits
-
Lots of include/linux/nfsd/* headers are only used by
nfsd module. Move them to the source directorySigned-off-by: Boaz Harrosh
Signed-off-by: J. Bruce Fields -
Now that the headers are fixed and carry their own wait, all fs/nfsd/
source files can include a minimal set of headers. and still compile just
fine.This patch should improve the compilation speed of the nfsd module.
Signed-off-by: Boaz Harrosh
Signed-off-by: J. Bruce Fields -
NFSv4 opens may function as locks denying other NFSv4 users the rights
to open a file.We're requiring a user to have write permissions before they can deny
write. We're *not* requiring a user to have write permissions to deny
read, which is if anything a more drastic denial.What was intended was to require write permissions for DENY_READ.
Signed-off-by: J. Bruce Fields
14 Nov, 2009
1 commit
-
None of this stuff is used outside nfsd, so move it out of the common
linux include directory.Actually, probably none of the stuff in include/linux/nfsd/nfsd.h really
belongs there, so later we may remove that file entirely.Signed-off-by: J. Bruce Fields
02 Sep, 2009
1 commit
-
The fact that the filesystem doesn't currently list any alternate
locations does _not_ imply that the fs_locations attribute should be
marked as "unsupported".Signed-off-by: Trond Myklebust
Signed-off-by: J. Bruce Fields
29 Jul, 2009
3 commits
-
The sequence operation is not cached; always encode the sequence operation on
a replay from the slot table and session values. This simplifies the sessions
replay logic in nfsd4_proc_compound.If this is a replay of a compound that was specified not to be cached, return
NFS4ERR_RETRY_UNCACHED_REP.Signed-off-by: Andy Adamson
Signed-off-by: J. Bruce Fields -
This function is only used for SEQUENCE replay.
Signed-off-by: Andy Adamson
Signed-off-by: J. Bruce Fields -
Instead of trying to share the generic 4.1 reply cache code for the
CREATE_SESSION reply cache, it's simpler to handle CREATE_SESSION
separately.The nfs41 single slot clientid DRC holds the results of create session
processing. CREATE_SESSION can be preceeded by a SEQUENCE operation
(an embedded CREATE_SESSION) and the create session single slot cache must be
maintained. nfsd4_replay_cache_entry() and nfsd4_store_cache_entry() do not
implement the replay of an embedded CREATE_SESSION.The clientid DRC slot does not need the inuse, cachethis or other fields that
the multiple slot session cache uses. Replace the clientid DRC cache struct
nfs4_slot cache with a new nfsd4_clid_slot cache. Save the xdr struct
nfsd4_create_session into the cache at the end of processing, and on a replay,
replace the struct for the replay request with the cached version all while
under the state lock.nfsd4_proc_compound will handle both the solo and embedded CREATE_SESSION case
via the normal use of encode_operation.Errors that do not change the create session cache:
A create session NFS4ERR_STALE_CLIENTID error means that a client record
(and associated create session slot) could not be found and therefore can't
be changed. NFSERR_SEQ_MISORDERED errors do not change the slot cache.All other errors get cached.
Remove the clientid DRC specific check in nfs4svc_encode_compoundres to
put the session only if cstate.session is set which will now always be true.Signed-off-by: Andy Adamson
Signed-off-by: J. Bruce Fields
15 Jul, 2009
1 commit
-
ACL in operations 'open' and 'create' is decoded but never be used.
It should be set as the initial ACL for the object according to RFC3530.
If error occurs when setting the ACL, just clear the ACL bit in the
returned attr bitmap.Signed-off-by: Yu Zhiguo
Signed-off-by: J. Bruce Fields
02 Jun, 2009
2 commits
-
J. Bruce Fields wrote:
...
> (This is extremely confusing code to track down: note that
> proc->pc_decode is set to nfs4svc_decode_compoundargs() by the PROC()
> macro at the end of fs/nfsd/nfs4proc.c. Which means, for example, that
> grepping for nfs4svc_decode_compoundargs() gets you nowhere. Patches to
> kill off that macro would be welcomed....)the macro 'PROC' is complicated and obscure, it had better
be killed off in order to make the code more clear.Signed-off-by: Yu Zhiguo
Signed-off-by: J. Bruce Fields -
Server should return NFS4ERR_ATTRNOTSUPP if an attribute specified is
not supported in current environment.
Operations CREATE, NVERIFY, OPEN, SETATTR and VERIFY should do this check.This bug is found when do newpynfs tests. The names of the tests that failed
are following:
CR12 NVF7a NVF7b NVF7c NVF7d NVF7f NVF7r NVF7s
OPEN15 VF7a VF7b VF7c VF7d VF7f VF7r VF7sAdd function do_check_fattr() to do exact check:
1, Check attribute specified is supported by the NFSv4 server or not.
2, Check FATTR4_WORD0_ACL & FATTR4_WORD0_FS_LOCATIONS are supported
in current environment or not.
3, Check attribute specified is writable or not.step 1 and 3 are done in function nfsd4_decode_fattr() but removed
to this function now.Signed-off-by: Yu Zhiguo
Signed-off-by: J. Bruce Fields
04 Apr, 2009
13 commits
-
Implement the CREATE_EXCLUSIVE4_1 open mode conforming to
http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26This mode allows the client to atomically create a file
if it doesn't exist while setting some of its attributes.It must be implemented if the server supports persistent
reply cache and/or pnfs.Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields -
Also, use client minorversion to generate supported attrs
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields -
_nfsd4_verify currently skips 3 words from the encoded buffer begining.
With support for 3-word attr bitmaps in nfsd41, nfsd4_encode_fattr
may encode 1, 2, or 3 words, and not always 2 as it used to be, hence
we need to find out where to skip using the encoded bitmap length.Note: This patch may be applied over pre-nfsd41 nfsd.
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields -
Support enabling and disabling nfsv4.1 via /proc/fs/nfsd/versions
by writing the strings "+4.1" or "-4.1" correspondingly.Use user mode nfs-utils (rpc.nfsd option) to enable.
This will allow us to get rid of CONFIG_NFSD_V4_1[nfsd41: disable support for minorversion by default]
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields -
For nfs41, the open share flags are used also for
delegation "wants" and "signals". Check that they are valid.Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields -
Extract the clientid from sessionid to set the op_clientid on open.
Verify that the clid for other stateful ops is zero for minorversion != 0
Do all other checks for stateful ops without sessions.Signed-off-by: Benny Halevy
Signed-off-by: Andy Adamson
[fixed whitespace indent]
Signed-off-by: Benny Halevy
[nfsd41 remove sl_session from nfsd4_open]
Signed-off-by: Andy Adamson
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields -
When sessions are used, stateful operation sequenceid and stateid handling
are not used. When sessions are used, on the first open set the seqid to 1,
mark state confirmed and skip seqid processing.When sessionas are used the stateid generation number is ignored when it is zero
whereas without sessions bad_stateid or stale stateid is returned.Add flags to propagate session use to all stateful ops and down to
check_stateid_generation.Signed-off-by: Benny Halevy
Signed-off-by: Andy Adamson
[nfsd4_has_session should return a boolean, not u32]
Signed-off-by: Benny Halevy
[nfsd41: pass nfsd4_compoundres * to nfsd4_process_open1]
[nfsd41: calculate HAS_SESSION in nfs4_preprocess_stateid_op]
[nfsd41: calculate HAS_SESSION in nfs4_preprocess_seqid_op]
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields -
Currently we only use cstate->current_fh,
will also be used by nfsd41 code.Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields -
A session inactivity time compound (lease renewal) or a compound where the
sequence operation has sa_cachethis set to FALSE do not require any pages
to be held in the v4.1 DRC. This is because struct nfsd4_slot is already
caching the session information.Add logic to the nfs41 server to not cache response pages for solo sequence
responses.Return nfserr_replay_uncached_rep on the operation following the sequence
operation when sa_cachethis is FALSE.Signed-off-by: Andy Adamson
Signed-off-by: Benny Halevy
[nfsd41: use cstate session in nfsd4_replay_cache_entry]
[nfsd41: rename nfsd4_no_page_in_cache]
[nfsd41 rename nfsd4_enc_no_page_replay]
[nfsd41 nfsd4_is_solo_sequence]
[nfsd41 change nfsd4_not_cached return]
Signed-off-by: Andy Adamson
[changed return type to bool]
Signed-off-by: Benny Halevy
[nfsd41 drop parens in nfsd4_is_solo_sequence call]
Signed-off-by: Andy Adamson
[changed "== 0" to "!"]
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields -
Replay a request in nfsd4_sequence.
Add a minorversion to struct nfsd4_compound_state.Pass the current slot to nfs4svc_encode_compound res via struct
nfsd4_compoundres to set an NFSv4.1 DRC entry.Signed-off-by: Andy Adamson
Signed-off-by: Benny Halevy
[nfsd41: use bool inuse for slot state]
Signed-off-by: Benny Halevy
[nfsd41: use cstate session in nfs4svc_encode_compoundres]
[nfsd41 replace nfsd4_set_cache_entry]
Signed-off-by: Andy Adamson
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields -
Signed-off-by: Andy Adamson
[nfsd41: do not verify nfserr_sequence_pos for minorversion 0]
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields -
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields -
On an NFSv4.1 server cache miss that causes an upcall, NFS4ERR_DELAY will be
returned. It is up to the NFSv4.1 client to resend only the operations that
have not been processed.Initialize rq_usedeferral to 1 in svc_process(). It sill be turned off in
nfsd4_proc_compound() only when NFSv4.1 Sessions are used.Note: this isn't an adequate solution on its own. It's acceptable as a way
to get some minimal 4.1 up and working, but we're going to have to find a
way to avoid returning DELAY in all common cases before 4.1 can really be
considered ready.Signed-off-by: Andy Adamson
Signed-off-by: Benny Halevy
[nfsd41: reverse rq_nodeferral negative logic]
Signed-off-by: Benny Halevy
[sunrpc: initialize rq_usedeferral]
Signed-off-by: Andy Adamson
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields
31 Mar, 2009
1 commit
-
There's no need for it.
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields
30 Mar, 2009
1 commit
-
Remove the allocation of struct nfsd4_compound_state.
Signed-off-by: Andy Adamson
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields
19 Mar, 2009
7 commits
-
Note that we already checked for this invalid case at the top of this
function.Signed-off-by: J. Bruce Fields
-
Currently putpubfh returns NFSERR_OPNOTSUPP, which isn't actually
allowed for v4. The right error is probably NFSERR_NOTSUPP.But let's just implement it; though rarely seen, it can be used by
Solaris (with a special mount option), is mandated by the rfc, and is
trivial for us to support.Thanks to Yang Hongyang for pointing out the original problem, and to
Mike Eisler, Tom Talpey, Trond Myklebust, and Dave Noveck for further
argument....Signed-off-by: J. Bruce Fields
-
If a filesystem being written to via NFS returns a short write count
(as opposed to an error) to nfsd, nfsd treats that as a success for
the entire write, rather than the short count that actually succeeded.For example, given a 8192 byte write, if the underlying filesystem
only writes 4096 bytes, nfsd will ack back to the nfs client that all
8192 bytes were written. The nfs client does have retry logic for
short writes, but this is never called as the client is told the
complete write succeeded.There are probably other ways it could happen, but in my case it
happened with a fuse (filesystem in userspace) filesystem which can
rather easily have a partial write.Here is a patch to properly return the short write count to the
client.Signed-off-by: David Shaw
Signed-off-by: J. Bruce Fields -
All users now pass this, so it's meaningless.
Signed-off-by: J. Bruce Fields
-
Signed-off-by: J. Bruce Fields
-
Signed-off-by: J. Bruce Fields
-
The use of |= is confusing--the bitmask is always initialized to zero in
this case, so we're effectively just doing an assignment here.Signed-off-by: J. Bruce Fields
08 Jan, 2009
1 commit
-
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields