[libvirt] [PATCH] Add a define for NFS_SUPER_MAGIC

Eric Blake eblake at redhat.com
Wed Mar 3 16:56:04 UTC 2010


According to Chris Lalancette on 3/3/2010 9:44 AM:
> Commit 3c12a67b766cce51b47861ccde2be41de369f832 added
> a dependency on the NFS_SUPER_MAGIC macro, which is
> defined in linux/magic.h.  Unfortunately linux/magic.h
> is not available in RHEL-5, and causes a compile error.
> Just define it locally, since this is something that
> can't change.

ACK.

>  #ifdef __linux__
>  #include <sys/vfs.h>
> -#include <linux/magic.h>
> -#endif
> +#ifndef NFS_SUPER_MAGIC
> +#define NFS_SUPER_MAGIC 0x6969
> +#endif /* NFS_SUPER_MAGIC */
> +#endif /* __linux__ */

Style question (and yet another thing for me to add to my pending HACKING
patch): any objections to indenting preprocessor directives to make it
easier to track nesting?  As in:

#ifdef __linux__
# include <sys/vfs.h>
# ifndef NFS_SUPER_MAGIC
#  define NFS_SUPER_MAGIC 0x6969
# endif /* NFS_SUPER_MAGIC */
#endif /* __linux__ */

-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 320 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20100303/fda7d098/attachment-0001.sig>


More information about the libvir-list mailing list