On Sun January 1 2012, Ben Hutchings wrote: > On Mon, 2012-01-02 at 11:58 +0900, sf...@users.sourceforge.net wrote: > > Thorsten Glaser: > > > >It introduces a new separated file include/linux/aufs_name.h. > > > > > > Isn=E2=80=99t that a bit overkill? > > > > Hmm, I may have to agree with that. > > Honestly speaking, I don't like this approach. > > But embedding (expanding) AUFS_NAME is worse for me. > > Why, how often do you expect to change AUFS_NAME? >
Probably as often as Linux-2.6.x is changed to Linux-3.x ;-) For instance, this page: http://packages.debian.org/squeeze/aufs-tools In the side-bar lists the matching 2.6.26 kernel modules. Where as this page: http://packages.debian.org/wheezy/aufs-tools Which is the link to the 3.x utilities also lists the 2.6.26 modules - __NOT__ the 3.x modules. This is a significant difference because an ioctrl changed between the two versions and using the aufs-tools-2.6 on a 3.0, 3.1, 3.2 kernel results in auplink making an error exit rather than taking down the auFS stack. (auplink is called by umount.aufs) Mike > [...] > > So I still think it is better to define it in Makefile. > > If I remove refering the "current" macro in the definition, then the > > life will be easier, but it is still useful and I want to keep > > it. Additonally it is not a essential problem I think. > > Finally I'd like to add sched.h between aufs_name and pr_fmt (see the > > attached patch). > > How do you think? > > I think it would be much better to put this in fs/aufs/aufs.h and make > each of fs/aufs/*.c include that first. > > > J. R. Okajima > > > > --- a/fs/aufs/Makefile > > +++ b/fs/aufs/Makefile > > @@ -10,6 +10,7 @@ endif > > ccflags-y += -DDEBUG > > # sparse doesn't allow spaces > > ccflags-y += -imacros linux/aufs_name.h > > +ccflags-y += -include linux/sched.h > > ccflags-y += > > -D'pr_fmt(fmt)=AUFS_NAME"\040%s:%d:%s[%d]:\040"fmt,__func__,__LINE__,current->comm,current->pid' > > > > obj-$(CONFIG_AUFS_FS) += aufs.o > > The comment about sparse belongs immediately before the definition of > pr_fmt. > > Ben. > ------------------------------------------------------------------------------ Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex infrastructure or vast IT resources to deliver seamless, secure access to virtual desktops. With this all-in-one solution, easily deploy virtual desktops for less than the cost of PCs and save 60% on VDI infrastructure costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox