aboutsummaryrefslogtreecommitdiff
path: root/sys/ufs
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2004-02-04 21:52:57 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2004-02-04 21:52:57 +0000
commit91d5354a2ce810d848eca6ecf9da1027aeb2be6d (patch)
treed9c0a05d62914174d6f00ab22300e935c3e6d983 /sys/ufs
parent890cefab5b3dd6f2a1fbfffae44730a0434b2e84 (diff)
downloadsrc-91d5354a2ce810d848eca6ecf9da1027aeb2be6d.tar.gz
src-91d5354a2ce810d848eca6ecf9da1027aeb2be6d.zip
Locking for the per-process resource limits structure.
- struct plimit includes a mutex to protect a reference count. The plimit structure is treated similarly to struct ucred in that is is always copy on write, so having a reference to a structure is sufficient to read from it without needing a further lock. - The proc lock protects the p_limit pointer and must be held while reading limits from a process to keep the limit structure from changing out from under you while reading from it. - Various global limits that are ints are not protected by a lock since int writes are atomic on all the archs we support and thus a lock wouldn't buy us anything. - All accesses to individual resource limits from a process are abstracted behind a simple lim_rlimit(), lim_max(), and lim_cur() API that return either an rlimit, or the current or max individual limit of the specified resource from a process. - dosetrlimit() was renamed to kern_setrlimit() to match existing style of other similar syscall helper functions. - The alpha OSF/1 compat layer no longer calls getrlimit() and setrlimit() (it didn't used the stackgap when it should have) but uses lim_rlimit() and kern_setrlimit() instead. - The svr4 compat no longer uses the stackgap for resource limits calls, but uses lim_rlimit() and kern_setrlimit() instead. - The ibcs2 compat no longer uses the stackgap for resource limits. It also no longer uses the stackgap for accessing sysctl's for the ibcs2_sysconf() syscall but uses kernel_sysctl() instead. As a result, ibcs2_sysconf() no longer needs Giant. - The p_rlimit macro no longer exists. Submitted by: mtm (mostly, I only did a few cleanups and catchups) Tested on: i386 Compiled on: alpha, amd64
Notes
Notes: svn path=/head/; revision=125454
Diffstat (limited to 'sys/ufs')
-rw-r--r--sys/ufs/ffs/ffs_vnops.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 7f3988b1c879..7abceaf95a46 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -634,13 +634,15 @@ ffs_write(ap)
* file servers have no limits, I don't think it matters.
*/
td = uio->uio_td;
- if (vp->v_type == VREG && td &&
- uio->uio_offset + uio->uio_resid >
- td->td_proc->p_rlimit[RLIMIT_FSIZE].rlim_cur) {
+ if (vp->v_type == VREG && td != NULL) {
PROC_LOCK(td->td_proc);
- psignal(td->td_proc, SIGXFSZ);
+ if (uio->uio_offset + uio->uio_resid >
+ lim_cur(td->td_proc, RLIMIT_FSIZE)) {
+ psignal(td->td_proc, SIGXFSZ);
+ PROC_UNLOCK(td->td_proc);
+ return (EFBIG);
+ }
PROC_UNLOCK(td->td_proc);
- return (EFBIG);
}
resid = uio->uio_resid;