Commit Graph

1849 Commits

Author SHA1 Message Date
Richard Laager
1dc3fea59e More and correct an example in zpool.8
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2011-04-19 11:36:17 -07:00
Richard Laager
1fe2e23771 Change /dev/dsk -> /dev in the man pages
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2011-04-19 11:35:21 -07:00
Richard Laager
2d1b7b0b97 Correct man page section numbers for Linux
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2011-04-19 11:33:51 -07:00
Brian Behlendorf
12c1acde76 Set -Wno-unused-but-set-variable globally
As of gcc-4.6 the option -Wunused-but-set-variable is enabled by
default.  While this is a useful warning there are numerous places
in the ZFS code when a variable is set and then only checked in an
ASSERT().  To avoid having to update every instance of this in the
code we now set -Wno-unused-but-set-variable to suppress the warning.

Additionally, when building with --enable-debug and -Werror set these
warning also become fatal.  We can reevaluate the suppression of these
error at a later time if it becomes an issue.  For now we are basically
just reverting to the previous gcc behavior.
2011-04-19 10:44:10 -07:00
Brian Behlendorf
79713039a2 Fix gcc configure warnings
Newer versions of gcc are getting smart enough to detect the sloppy
syntax used for the autoconf tests.  It is now generating warnings
for unused/undeclared variables.  Newer version of gcc even have
the -Wunused-but-set-variable option set by default.  This isn't a
problem except when -Werror is set and they get promoted to an error.
In this case the autoconf test will return an incorrect result which
will result in a build failure latter on.

To handle this I'm tightening up many of the autoconf tests to
explicitly mark variables as unused to suppress the gcc warning.
Remember, all of the autoconf code can never actually be run we
just want to get a clean build error to detect which APIs are
available.  Never using a variable is absolutely fine for this.

Closes #176
2011-04-19 10:10:47 -07:00
Brian Behlendorf
03514b0110 Fix gcc compiler warning, parse_option()
When compiling ZFS in user space gcc-4.6.0 correctly identifies
the variable 'value' as being set but never used.  This generates a
warning and a build failure when using --enable-debug.  Once again
this is correct but I'm reluctant to remove 'value' because we are
breaking the string in to name/value pairs.  While it is not used
now there's a good chance it will be soon and I'd rather not have
to reinvent this.  To suppress the warning with just as a VERIFY().
This was observed under Fedora 15.

  cmd/mount_zfs/mount_zfs.c: In function ‘parse_option’:
  cmd/mount_zfs/mount_zfs.c:112:21: error: variable ‘value’ set but not
  used [-Werror=unused-but-set-variable]
2011-04-19 09:04:51 -07:00
Brian Behlendorf
0fe3d820f5 Fix gcc compiler warning, dsl_pool_create()
When compiling ZFS in user space gcc-4.6.0 correctly identifies
the variable 'os' as being set but never used.  This generates a
warning and a build failure when using --enable-debug.  However,
the code is correct we only want to use 'os' for the kernel space
builds.  To suppress the warning the call was wrapped with a
VERIFY() which has the nice side effect of ensuring the 'os'
actually never is NULL.  This was observed under Fedora 15.

  module/zfs/dsl_pool.c: In function ‘dsl_pool_create’:
  module/zfs/dsl_pool.c:229:12: error: variable ‘os’ set but not used
  [-Werror=unused-but-set-variable]
2011-04-19 09:04:51 -07:00
Brian Behlendorf
e30c0ada6d Linux 2.6.39 compat, invalidate_inodes()
Update code to use the spl_invalidate_inodes() wrapper.  This hides
some of the complexity of determining if invalidate_inodes() was
exported, and if so what is its prototype.  The second argument
of spl_invalidate_inodes() determined the behavior of how dirty
inodes are handled.  By passing a zero we are indicated that we
want those inodes to be treated as busy and skipped.
2011-04-19 08:57:23 -07:00
Brian Behlendorf
cbf81d4c3b Autogen refresh for kernel-insert-inode-locked.m4
Several Makefile.in's were accidentally not updated when the
kernel-insert-inode-locked.m4 check was added.  This change simply
refreshes the missed files.
2011-04-18 15:47:18 -07:00
Darik Horn
12346f1d77 Merge branch 'kfreebsd' 2011-04-08 21:21:03 -05:00
Darik Horn
1df824eca7 Add a NEWS entry for the decomposition and rename. 2011-04-08 20:13:32 -05:00
Brian Behlendorf
0f6fd32927 Fix rebuildable RPMs for el6/ch5
When rebuilding the source RPM under el5 you need to append the
target_cpu.  However, under el6/ch5 things are packaged correctly
and the arch is already part of kver.  For this reason it also
needs to be stripped from kver when setting kverpkg.
2011-04-08 10:22:42 -07:00
Ned Bass
38baef530d Align closing fi in mount-zfs.sh 2011-04-08 10:05:18 -07:00
Ned Bass
c4803a9663 Use consistent indentation in mount-zfs.sh 2011-04-08 09:25:18 -07:00
Richard Laager
f132992361 Fix a couple comments
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2011-04-07 15:46:46 -07:00
Brian Behlendorf
0d3ac5e735 Linux 2.6.29 compat, credentials
The .sync_fs fix as applied did not use the updated SPL credential
API.  This broke builds on Debian Lenny, this change applies the
needed fix to use the portable API.  The original credential changes
are part of commit 81e97e2187.
2011-04-07 14:27:09 -07:00
Darik Horn
ff6ad91f22 Add a zfs-grub dependency to zfs-initramfs.
The grub-common package at ppa:dajhorn/zfs-grub provides a
virtual zfs-grub package.

Updating the initrd on a system with a ZFS root filesystem
requires that the grub-probe utility from the grub2 source
package be compiled against a native libzfs.

The /etc/grub.d runparts must also recognize the ZFS root
filesystem so that appropriate kernel command line
parameters are added to the /boot/grub/grub.cfg file.
2011-04-07 14:17:34 -05:00
Darik Horn
6e1df1e9c2 Use git-dch to update the debian/changelog. 2011-04-07 13:52:30 -05:00
Darik Horn
6b6185a549 Merge branch 'upstream' into kfreebsd 2011-04-07 13:48:28 -05:00
Brian Behlendorf
9b1d6001bc Prep zfs-0.6.0-rc3 tag
Create the third 0.6.0 release candidate tag (rc3).
2011-04-07 10:49:55 -07:00
Manuel Amador (Rudd-O)
f5ef7150ea Update zfs.fedora init script
Apply all of Rudd-O's changes for the Fedora init script.  The
initial init script was one I threw together based on Rudd-O's
original work.  It worked for me but it has some flaws.

Rudd-O has invested considerable time updating it to be significantly
smarter.  It now handles using ZFS as your root filesystem plus
various other quirks.  Since he is familiar with the right
way to do things on Fedora and has tested this init script we
are integrating all of his changes.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2011-04-07 10:48:11 -07:00
Darik Horn
cacceadce4 Upstream zfs-0.6.0-rc3 tag. Use 0.6.0.7 instead. 2011-04-07 12:40:25 -05:00
Darik Horn
c440497510 Merge branch 'upstream' into kfreebsd 2011-04-07 12:39:50 -05:00
Manuel Amador (Rudd-O)
6583dcacdc Permit both mountpoint=legacy and mountpoint=/ in initrd
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2011-04-07 10:31:02 -07:00
Manuel Amador (Rudd-O)
8610b52bd4 Added .gitignore for mount.zfs and zvol_id
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2011-04-07 10:28:38 -07:00
Brian Behlendorf
eec8164771 Fix ASSERTION(!dsl_pool_sync_context(tx->tx_pool))
Disable the normal reclaim path for the txg_sync thread.  This
ensures the thread will never enter dmu_tx_assign() which can
otherwise occur due to direct reclaim.  If this is allowed to
happen the system can deadlock.  Direct reclaim call path:

  ->shrink_icache_memory->prune_icache->dispose_list->
  clear_inode->zpl_clear_inode->zfs_inactive->dmu_tx_assign
2011-04-07 09:52:16 -07:00
Brian Behlendorf
7cb67b45f3 Add direct+indirect ARC reclaim
Under OpenSolaris all memory reclaim is done asyncronously.  Under
Linux memory reclaim is done asynchronously _and_ synchronously.
When a process allocates memory with GFP_KERNEL it explicitly allows
the kernel to do reclaim on its behalf to satify the allocation.
If that GFP_KERNEL allocation fails the kernel may take more drastic
measures to reclaim the memory such as killing user space processes.

This was observed to happen with ZFS because the ARC could consume
a large fraction of the system memory but no synchronous reclaim
could be performed on it.  The result was GFP_KERNEL allocations
could fail resulting in OOM events, and only moments latter the
arc_reclaim thread would free unused memory from the ARC.

This change leaves the arc_thread in place to manage the fundamental
ARC behavior.  But it adds a synchronous (direct) reclaim path for
the ARC which can be called when memory is badly needed.  It also
adds an asynchronous (indirect) reclaim path which is called
much more frequently to prune the ARC slab caches.
2011-04-07 09:52:10 -07:00
Brian Behlendorf
1834f2d8b7 Add missing arcstats
The following useful values were missing the arcstats.  This change
adds them in to provide greater visibility in to the arcs behavior.

arc_no_grow                     4    0
arc_tempreserve                 4    0
arc_loaned_bytes                4    0
arc_meta_used                   4    624774592
arc_meta_limit                  4    400785408
arc_meta_max                    4    625594176
2011-04-07 09:52:05 -07:00
Brian Behlendorf
c85b224faf Call d_instantiate before unlocking inode
Under Linux a dentry referencing an inode must be instantiated before
the inode is unlocked.  To accomplish this without overly modifing
the core ZFS code the dentry it passed via the vattr_t.  There are
cases such as replay when a dentry is not available.  In which case
it is obviously not initialized at inode creation time, if a dentry
is needed it will be spliced as when required via d_lookup().
2011-04-07 09:51:57 -07:00
Darik Horn
a2a4cce565 Use git-dch to update the debian/changelog. 2011-04-07 10:53:18 -05:00
Darik Horn
b9bd745f97 Partial autogen updates.
The previous commit failed to compile properly in the PPA build
environment because the configure script was not updated.
2011-04-07 10:49:51 -05:00
Darik Horn
41d137f90c Use git-dch to update the debian/changelog. 2011-04-05 22:11:03 -05:00
Darik Horn
8f4bba50a7 Full upstream merge. Use zfs-0.6.0.6 as the unofficial upstream version. 2011-04-05 22:05:43 -05:00
Darik Horn
5e1d37de3f Remove volume and swap handling from the init script.
Managing volumes and swap areas in the init script like
Debian kFreeBSD does is appealing, but providing an
alternative management facility for these things adds
unnecessary complexity.
2011-04-05 22:03:10 -05:00
Darik Horn
1b1f7dc780 Add ${shlibs:Depends} to each control stanza.
Satisfy the dpkg-gencontrol warning and specify the external
dependencies for each library package.
2011-04-05 21:54:47 -05:00
Darik Horn
cc7ad9f0a2 Move udev rules from /etc to /lib.
Install 60-zpool.rules and 60-zvol.rules to /lib/udev/rules.d
instead of /etc/udev/rules.d according to packaging convention.
2011-04-05 21:04:39 -05:00
Darik Horn
ddd3d268ef Disable dracut instead of reverting it. 2011-04-05 20:29:51 -05:00
Darik Horn
7b8fdb5101 Rename /etc/default/zfsload during upgrades.
Preserve the /etc/default/zfsload configuration file by
renaming it to /etc/default/zfs during the replacement
upgrade from the zfs package to the zfsutils package.
2011-04-05 20:06:00 -05:00
Darik Horn
be6d4146bc Ignore zfs unmount -a errors in the init script.
The default dh_installinit prerm script tries to stop the zfs init
script, which causes package upgrade errors on busy systems.
2011-04-05 19:42:49 -05:00
Darik Horn
da690878c6 Remove make distclean kludge.
The module/Makefile.in template is updated such that
`make distclean` succeeds after `./configure --with-config=user`.
2011-04-05 19:37:00 -05:00
Darik Horn
12a73d6c3b Merge branch 'upstream' into kfreebsd 2011-04-05 19:36:11 -05:00
Darik Horn
22aee007bc Merge branch 'upstream' 2011-04-05 17:04:09 -05:00
Brian Behlendorf
d433c20651 Fix make distclean for `./configure --with-config=user
Making distclean in module
    make[1]: Entering directory `/zfs/module'
    make -C  SUBDIRS=`pwd`  clean
    make: Entering an unknown directory
    make: *** SUBDIRS=/zfs/module: No such file or directory.  Stop.

When using --with-config=user the 'distclean' target would fail
because it assumes the kernel configuration infrastrure is set up.
This is not the case, nor does it need to be, because the
'--with-config=user' option will prune the entire ./module subtree
from SUBDIRS.  This prevents most build rules from operating in the
./module directory.

However, the 'dist*' rules will still traverse this directory
because it is listed in DIST_SUBDIRS.  This is correct because we
need to ensure the dist rules package the directory contents
regardless of the configuration for the 'dist' rule.  The correct
way to handle this is to only invoke the kernel build system as
part of the 'clean' rule when CONFIG_KERNEL_TRUE is set.

Initial fix provided by Darik Horn <dajhorn@vanadac.com>.
This commit is a slightly refined form of the original.
2011-04-05 13:33:28 -07:00
Ned Bass
fa417e57a6 Call udevadm trigger more safely
Some udev hooks are not designed to be idempotent, so calling udevadm
trigger outside of the distribution's initialization scripts can have
unexpected (and potentially dangerous) side effects.  For example, the
system time may change or devices may appear multiple times.  See Ubuntu
launchpad bug 320200 and this mailing list post for more details:

https://lists.ubuntu.com/archives/ubuntu-devel/2009-January/027260.html

To avoid these problems we call udevadm trigger with --action=change
--subsystem-match=block.  The first argument tells udev just to refresh
devices, and make sure everything's as it should be.  The second
argument limits the scope to block devices, so devices belonging to
other subsystems cannot be affected.

This doesn't fix the problem on older udev implementations that don't
provide udevadm but instead have udevtrigger as a standalone program.
In this case the above options aren't available so there's no way to
call call udevtrigger safely.  But we can live with that since this
issue only exists in optional test and helper scripts, and most
zfs-on-linux users are running newer systems anyways.
2011-04-05 13:00:51 -07:00
Brian Behlendorf
34e4864009 Update CHAOS 5 Packaging
The CHAOS 5 kernels are now packaged identially to the RHEL6 kernels.
Therefore we can simply use the RHEL6 rules in the spec file when
building packages.
2011-03-31 13:49:42 -07:00
Brian Behlendorf
e88b041ed6 Fix libzpool cv_* build error
This build failure was accidentally introduced by previous commit
bfd214a which fixed the load average.  Unfortunately, the wrapper
for cv_wait_interruptible was not available in the zfs_context.h
user compatibility code.  I failed to notice this because I didn't
rebuild everything cleanly before committing.

  undefined reference to `cv_wait_interruptible'
  collect2: ld returned 1 exit status

Closes #181
2011-03-31 12:20:53 -07:00
Brian Behlendorf
bfd214af01 Fix inflated load average
Kernel threads which sleep uninterruptibly on Linux are marked in the (D)
state.  These threads are usually in the process of performing IO and are
thus counted against the load average.  The txg_quiesce and txg_sync threads
were always sleeping uninterruptibly and thus inflating the load average.

This change makes them sleep interruptibly.  Some care is required however
because these threads may now be woken early by signals.  In this case the
callers are all careful to check that the required conditions are met after
waking up.  If we're woken early due to a signal they will simply go back
to sleep.  In this case these changes are safe.

Closes #175
2011-03-31 17:07:12 -07:00
Darik Horn
4e5a12bd32 Manually update the debian/changelog. 2011-03-31 11:04:23 -05:00
Darik Horn
1291f65c4f Force the dkms.conf file into the zfs-dkms package.
Rename the debian/dkms file to debian/zfs-dkms.dkms so that
the dkms.conf file is included in the zfs-dkms package.

The dh_dkms debhelper put the dkms.conf file into the
libavl0 package after the library decomposition, which
caused upgrade errors.
2011-03-31 10:54:06 -05:00
Darik Horn
e1e5be2a61 Manually update the debian/changelog. 2011-03-30 16:14:16 -05:00