[PATCH v4 07/14] vfs_btrfs: add [GET/SET]_COMPRESSION handlers

Jeremy Allison jra at samba.org
Thu Nov 21 22:36:23 MST 2013


On Thu, Nov 21, 2013 at 08:49:04PM -0800, Jeremy Allison wrote:
> On Mon, Nov 18, 2013 at 02:54:32PM +0100, David Disseldorp wrote:
> > Translate such requests into FS_IOC_GETFLAGS and FS_IOC_SETFLAGS ioctls
> > respectively. The module makes no distinction between compression types,
> > only whether or not compression is enabled.
> > 
> > Signed-off-by: David Disseldorp <ddiss at samba.org>
> > ---
> >  source3/modules/vfs_btrfs.c | 119 +++++++++++++++++++++++++++++++++++++++++++-
> >  source3/wscript             |   2 +-
> >  2 files changed, 118 insertions(+), 3 deletions(-)
> > 
> > diff --git a/source3/modules/vfs_btrfs.c b/source3/modules/vfs_btrfs.c
> > index f854f2a..36d6120 100644
> > --- a/source3/modules/vfs_btrfs.c
> > +++ b/source3/modules/vfs_btrfs.c
> > @@ -18,11 +18,16 @@
> >   */
> >  
> >  #include <linux/ioctl.h>
> > +#include <linux/fs.h>
> 
> Yeah - this is the problem. Pulling in
> <linux/fs.h> defines WRITE_FLUSH, and
> we already have that in our tree.
> 
> I'll prepare a patch the preceeds
> this patchset that renames WRITE_FLUSH
> and friends in the enum to something
> with a Samba-specific prefix.

David, can you review the following
fix as a prefix to your changes ?

Once you +1 it I'll push the entire
patchset.

Cheers,

	Jeremy.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Rename-the-profile-enums-with-a-SAMBA_-prefix-to-avo.patch
Type: text/x-diff
Size: 10585 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20131121/0ea0e0ec/attachment.patch>


More information about the samba-technical mailing list