Date: Thu, 6 May 2010 18:47:02 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 177854 for review Message-ID: <201005061847.o46Il2o4053267@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@177854?ac=10 Change 177854 by trasz@trasz_victim on 2010/05/06 18:46:20 Adapt to recent changes regarding vn_rlimit_fsize(). Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/fs/msdosfs/msdosfs_vnops.c#9 edit .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clbio.c#13 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#13 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/fs/msdosfs/msdosfs_vnops.c#9 (text+ko) ==== @@ -54,7 +54,6 @@ #include <sys/buf.h> #include <sys/clock.h> #include <sys/dirent.h> -#include <sys/hrl.h> #include <sys/lock.h> #include <sys/lockf.h> #include <sys/malloc.h> ==== //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clbio.c#13 (text+ko) ==== @@ -39,7 +39,6 @@ #include <sys/systm.h> #include <sys/bio.h> #include <sys/buf.h> -#include <sys/hrl.h> #include <sys/kernel.h> #include <sys/mount.h> #include <sys/vmmeter.h> ==== //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#13 (text+ko) ==== @@ -1343,17 +1343,10 @@ int vn_rlimit_fsize(const struct vnode *vp, const struct uio *uio, const struct thread *td) { + if (vp->v_type != VREG || td == NULL) return (0); - PROC_LOCK(td->td_proc); - 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 (0); + return (hrl_allocated(td->td_proc, HRL_RESOURCE_FILESIZE, + (uoff_t)uio->uio_offset + uio->uio_resid)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005061847.o46Il2o4053267>