Skip to content

Commit

Permalink
Add: Add-.zfs-control-directory.patch
Browse files Browse the repository at this point in the history
Add support for the .zfs control directory.  This was accomplished
by leveraging as much of the existing ZFS infrastructure as posible
and updating it for Linux as required.  The bulk of the core
functionality is now all there with the following limitations.

*) The .zfs/snapshot directory automount support requires a 2.6.37
   or newer kernel.  The exception is RHEL6.2 which has backported
   the d_automount patches.

*) Creating/destroying/renaming snapshots with mkdir/rmdir/mv
   in the .zfs/snapshot directory works as expected.  However,
   this functionality is only available to root until zfs
   delegations are finished.

      * mkdir - create a snapshot
      * rmdir - destroy a snapshot
      * mv    - rename a snapshot

The following issues are known defeciences, but we expect them to
be addressed by future commits.

*) Add automount support for kernels older the 2.6.37.  This should
   be possible using follow_link() which is what Linux did before.

*) Accessing the the .zfs/snapshot directory via NFS is not yet
   possible.  The majority of the ground work for this is complete.
   However, finishing this work will require resolving some lingering
   integration issues with the Linux NFS kernel server.

*) The .zfs/shares directory exists but no futher smb functionality
   has yet been implemented.

Contributions-by: Rohan Puri <[email protected]>
Contributiobs-by: Andrew Barnes <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #173
  • Loading branch information
dajhorn committed Mar 21, 2012
1 parent 8ba3cb2 commit 2bac37d
Show file tree
Hide file tree
Showing 9 changed files with 3,337 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d93e090fd9490eed0563f0bfaef8be5a5b5cf90d Mon Sep 17 00:00:00 2001
From e226a12f50759eb7269a3957581ed61fcf9e9cc4 Mon Sep 17 00:00:00 2001
From: Darik Horn <[email protected]>
Date: Tue, 17 Jan 2012 19:45:07 -0600
Subject: [PATCH 1/7] Prevent manual builds in the DKMS source.
Subject: [PATCH 1/8] Prevent manual builds in the DKMS source.

Print an instructive error messsage and exit if the `dkms.conf` file
exists when the userland is configured. (ie: `--with-config=user`)
Expand Down Expand Up @@ -53,7 +53,7 @@ index 4fcef3d..16b8a76 100644
ZFS_AC_CONFIG_USER_ARCH
ZFS_AC_CONFIG_USER_IOCTL
diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index 823f332..32fc6ab 100644
index c5983d3..be1edfa 100644
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -58,10 +58,10 @@ AC_DEFUN([ZFS_AC_CONFIG], [
Expand Down
4 changes: 2 additions & 2 deletions debian/patches/0002-Remove-the-COPYING-file.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From f752df7e1e9be1346b7044ec70e0ec795e72ed0b Mon Sep 17 00:00:00 2001
From 3fbf212d9233c60cafd2d6357dacd496e51930f3 Mon Sep 17 00:00:00 2001
From: Darik Horn <[email protected]>
Date: Tue, 17 Jan 2012 22:18:47 -0600
Subject: [PATCH 2/7] Remove the COPYING file.
Subject: [PATCH 2/8] Remove the COPYING file.

Resolve this lintian warning by removing the COPYING file:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 1cd781902bbf986a16b1fbcf82c50de6fda4a7c0 Mon Sep 17 00:00:00 2001
From 049b1b4d3fdc31008aa8f40fb21049b7b16f984a Mon Sep 17 00:00:00 2001
From: Darik Horn <[email protected]>
Date: Tue, 17 Jan 2012 11:54:21 -0600
Subject: [PATCH 3/7] Remove all upstream init.d components.
Subject: [PATCH 3/8] Remove all upstream init.d components.

The etc/init.d/ components are redundant because the debian/ overlay
bundles init files according to Debian packaging policy.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 84858495e0923fbf94fb331fb05953a598c84959 Mon Sep 17 00:00:00 2001
From 444cc1a251e06c40918178c670a17742deeb2ca7 Mon Sep 17 00:00:00 2001
From: Darik Horn <[email protected]>
Date: Tue, 17 Jan 2012 20:27:32 -0600
Subject: [PATCH 4/7] Remove the upstream dracut component.
Subject: [PATCH 4/8] Remove the upstream dracut component.

The dracut/ component broke deb systems when it first added to the
upstream ZoL repository, had a near-zero download count when it was
Expand Down
4 changes: 2 additions & 2 deletions debian/patches/0005-Remove-userland-dist-rules.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d72cecab4b0d15082796648314a33fad36c25a1e Mon Sep 17 00:00:00 2001
From 31a84f1e6d3a050469a1170b80de1ea1e9d7a856 Mon Sep 17 00:00:00 2001
From: Darik Horn <[email protected]>
Date: Tue, 17 Jan 2012 22:23:16 -0600
Subject: [PATCH 5/7] Remove userland dist rules.
Subject: [PATCH 5/8] Remove userland dist rules.

The `make dist` rule is used to create the DKMS source package, which
does not contain the userland. (eg: Dist --with-config=kernel only.)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d50295867c2d105b0db793660afa51e09ac6f520 Mon Sep 17 00:00:00 2001
From 1ee1fa02519991f3a98fd7ec548b395d12a9d16d Mon Sep 17 00:00:00 2001
From: Darik Horn <[email protected]>
Date: Fri, 3 Feb 2012 14:49:49 -0600
Subject: [PATCH 6/7] Improve the --with-spl error for DKMS systems.
Subject: [PATCH 6/8] Improve the --with-spl error for DKMS systems.

If the SPL module is unavailable, then the operator gets an error
message that does not apply to installations that are mananged by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 6bce26a67ad5ea4e26bb8aaa69357ffd6806db48 Mon Sep 17 00:00:00 2001
From 3fae6446c3a99e380199e54515b3969f3a864b5e Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <[email protected]>
Date: Tue, 13 Mar 2012 14:29:16 -0700
Subject: [PATCH 7/7] Integrate ARC more tightly with Linux
Subject: [PATCH 7/8] Integrate ARC more tightly with Linux

Under Solaris the ARC was designed to stay one step ahead of the
VM subsystem. It would attempt to recognize low memory situtions
Expand Down
Loading

0 comments on commit 2bac37d

Please sign in to comment.