* Re: + ext2-get-rid-of-most-mentions-of-xip-in-ext2.patch added to -mm tree [not found] <54b4548f.X6zUbiROuSfruGuT%akpm@linux-foundation.org> @ 2015-01-15 10:30 ` Jan Kara 2015-01-16 21:09 ` Wilcox, Matthew R 0 siblings, 1 reply; 3+ messages in thread From: Jan Kara @ 2015-01-15 10:30 UTC (permalink / raw) To: matthew.r.wilcox Cc: akpm, andreas.dilger, axboe, boaz, david, hch, jack, kirill.shutemov, mathieu.desnoyers, rdunlap, ross.zwisler, tytso, mm-commits, linux-ext4 On Mon 12-01-15 15:11:11, Andrew Morton wrote: ... > diff -puN fs/ext2/ext2.h~ext2-get-rid-of-most-mentions-of-xip-in-ext2 fs/ext2/ext2.h > --- a/fs/ext2/ext2.h~ext2-get-rid-of-most-mentions-of-xip-in-ext2 > +++ a/fs/ext2/ext2.h > @@ -380,14 +380,15 @@ struct ext2_inode { > #define EXT2_MOUNT_NO_UID32 0x000200 /* Disable 32-bit UIDs */ > #define EXT2_MOUNT_XATTR_USER 0x004000 /* Extended user attributes */ > #define EXT2_MOUNT_POSIX_ACL 0x008000 /* POSIX Access Control Lists */ > -#ifdef CONFIG_FS_DAX > -#define EXT2_MOUNT_XIP 0x010000 /* Execute in place */ > -#else > -#define EXT2_MOUNT_XIP 0 > -#endif > +#define EXT2_MOUNT_XIP 0x010000 /* Obsolete, use DAX */ > #define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */ > #define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */ > #define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */ > +#ifdef CONFIG_FS_DAX > +#define EXT2_MOUNT_DAX 0x100000 /* Direct Access */ > +#else > +#define EXT2_MOUNT_DAX 0 > +#endif Why do you define EXT2_MOUNT_DAX differently depending on CONFIG_FS_DAX? That seems unnecessary... ... > diff -puN fs/ext2/super.c~ext2-get-rid-of-most-mentions-of-xip-in-ext2 fs/ext2/super.c > --- a/fs/ext2/super.c~ext2-get-rid-of-most-mentions-of-xip-in-ext2 > +++ a/fs/ext2/super.c > @@ -294,6 +294,8 @@ static int ext2_show_options(struct seq_ > #ifdef CONFIG_FS_DAX > if (sbi->s_mount_opt & EXT2_MOUNT_XIP) > seq_puts(seq, ",xip"); > + if (sbi->s_mount_opt & EXT2_MOUNT_DAX) > + seq_puts(seq, ",dax"); > #endif > > if (!test_opt(sb, RESERVATION)) So if someone mounts filesystem with -o xip, /proc/mounts will show both 'xip' and 'dax'. OK, probably makes sense. Honza -- Jan Kara <jack@suse.cz> SUSE Labs, CR ^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: + ext2-get-rid-of-most-mentions-of-xip-in-ext2.patch added to -mm tree 2015-01-15 10:30 ` + ext2-get-rid-of-most-mentions-of-xip-in-ext2.patch added to -mm tree Jan Kara @ 2015-01-16 21:09 ` Wilcox, Matthew R 2015-01-19 9:45 ` Jan Kara 0 siblings, 1 reply; 3+ messages in thread From: Wilcox, Matthew R @ 2015-01-16 21:09 UTC (permalink / raw) To: Jan Kara Cc: akpm@linux-foundation.org, Dilger, Andreas, axboe@kernel.dk, boaz@plexistor.com, david@fromorbit.com, hch@lst.de, kirill.shutemov@linux.intel.com, mathieu.desnoyers@efficios.com, rdunlap@infradead.org, ross.zwisler@linux.intel.com, tytso@mit.edu, mm-commits@vger.kernel.org, linux-ext4@vger.kernel.org Ugh ... this works better from my linux.intel.com address ... -----Original Message----- From: Jan Kara [mailto:jack@suse.cz] Sent: Thursday, January 15, 2015 2:31 AM To: Wilcox, Matthew R Cc: akpm@linux-foundation.org; Dilger, Andreas; axboe@kernel.dk; boaz@plexistor.com; david@fromorbit.com; hch@lst.de; jack@suse.cz; kirill.shutemov@linux.intel.com; mathieu.desnoyers@efficios.com; rdunlap@infradead.org; ross.zwisler@linux.intel.com; tytso@mit.edu; mm-commits@vger.kernel.org; linux-ext4@vger.kernel.org Subject: Re: + ext2-get-rid-of-most-mentions-of-xip-in-ext2.patch added to -mm tree On Mon 12-01-15 15:11:11, Andrew Morton wrote: ... > diff -puN fs/ext2/ext2.h~ext2-get-rid-of-most-mentions-of-xip-in-ext2 fs/ext2/ext2.h > --- a/fs/ext2/ext2.h~ext2-get-rid-of-most-mentions-of-xip-in-ext2 > +++ a/fs/ext2/ext2.h > @@ -380,14 +380,15 @@ struct ext2_inode { > #define EXT2_MOUNT_NO_UID32 0x000200 /* Disable 32-bit UIDs */ > #define EXT2_MOUNT_XATTR_USER 0x004000 /* Extended user attributes */ > #define EXT2_MOUNT_POSIX_ACL 0x008000 /* POSIX Access Control Lists */ > -#ifdef CONFIG_FS_DAX > -#define EXT2_MOUNT_XIP 0x010000 /* Execute in place */ > -#else > -#define EXT2_MOUNT_XIP 0 > -#endif > +#define EXT2_MOUNT_XIP 0x010000 /* Obsolete, use DAX */ > #define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */ > #define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */ > #define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */ > +#ifdef CONFIG_FS_DAX > +#define EXT2_MOUNT_DAX 0x100000 /* Direct Access */ > +#else > +#define EXT2_MOUNT_DAX 0 > +#endif Why do you define EXT2_MOUNT_DAX differently depending on CONFIG_FS_DAX? That seems unnecessary... That's copied from the original XIP code. I think the intent is to make the XIP/DAX code disappear from the module, rather than being dead code cluttering up the object file. ... > diff -puN fs/ext2/super.c~ext2-get-rid-of-most-mentions-of-xip-in-ext2 fs/ext2/super.c > --- a/fs/ext2/super.c~ext2-get-rid-of-most-mentions-of-xip-in-ext2 > +++ a/fs/ext2/super.c > @@ -294,6 +294,8 @@ static int ext2_show_options(struct seq_ > #ifdef CONFIG_FS_DAX > if (sbi->s_mount_opt & EXT2_MOUNT_XIP) > seq_puts(seq, ",xip"); > + if (sbi->s_mount_opt & EXT2_MOUNT_DAX) > + seq_puts(seq, ",dax"); > #endif > > if (!test_opt(sb, RESERVATION)) So if someone mounts filesystem with -o xip, /proc/mounts will show both 'xip' and 'dax'. OK, probably makes sense. Yeah, I thought that was the best migration path; somebody might have a script that's checking for 'xip' in /proc/mounts. ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: + ext2-get-rid-of-most-mentions-of-xip-in-ext2.patch added to -mm tree 2015-01-16 21:09 ` Wilcox, Matthew R @ 2015-01-19 9:45 ` Jan Kara 0 siblings, 0 replies; 3+ messages in thread From: Jan Kara @ 2015-01-19 9:45 UTC (permalink / raw) To: Wilcox, Matthew R Cc: Jan Kara, akpm@linux-foundation.org, Dilger, Andreas, axboe@kernel.dk, boaz@plexistor.com, david@fromorbit.com, hch@lst.de, kirill.shutemov@linux.intel.com, mathieu.desnoyers@efficios.com, rdunlap@infradead.org, ross.zwisler@linux.intel.com, tytso@mit.edu, mm-commits@vger.kernel.org, linux-ext4@vger.kernel.org On Fri 16-01-15 21:09:03, Wilcox, Matthew R wrote: > -----Original Message----- > From: Jan Kara [mailto:jack@suse.cz] > Sent: Thursday, January 15, 2015 2:31 AM > To: Wilcox, Matthew R > Cc: akpm@linux-foundation.org; Dilger, Andreas; axboe@kernel.dk; boaz@plexistor.com; david@fromorbit.com; hch@lst.de; jack@suse.cz; kirill.shutemov@linux.intel.com; mathieu.desnoyers@efficios.com; rdunlap@infradead.org; ross.zwisler@linux.intel.com; tytso@mit.edu; mm-commits@vger.kernel.org; linux-ext4@vger.kernel.org > Subject: Re: + ext2-get-rid-of-most-mentions-of-xip-in-ext2.patch added to -mm tree > > On Mon 12-01-15 15:11:11, Andrew Morton wrote: > ... > > diff -puN fs/ext2/ext2.h~ext2-get-rid-of-most-mentions-of-xip-in-ext2 fs/ext2/ext2.h > > --- a/fs/ext2/ext2.h~ext2-get-rid-of-most-mentions-of-xip-in-ext2 > > +++ a/fs/ext2/ext2.h > > @@ -380,14 +380,15 @@ struct ext2_inode { > > #define EXT2_MOUNT_NO_UID32 0x000200 /* Disable 32-bit UIDs */ > > #define EXT2_MOUNT_XATTR_USER 0x004000 /* Extended user attributes */ > > #define EXT2_MOUNT_POSIX_ACL 0x008000 /* POSIX Access Control Lists */ > > -#ifdef CONFIG_FS_DAX > > -#define EXT2_MOUNT_XIP 0x010000 /* Execute in place */ > > -#else > > -#define EXT2_MOUNT_XIP 0 > > -#endif > > +#define EXT2_MOUNT_XIP 0x010000 /* Obsolete, use DAX */ > > #define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */ > > #define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */ > > #define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */ > > +#ifdef CONFIG_FS_DAX > > +#define EXT2_MOUNT_DAX 0x100000 /* Direct Access */ > > +#else > > +#define EXT2_MOUNT_DAX 0 > > +#endif > Why do you define EXT2_MOUNT_DAX differently depending on CONFIG_FS_DAX? > That seems unnecessary... > > That's copied from the original XIP code. I think the intent is to make the XIP/DAX code disappear from the module, rather than being dead code cluttering up the object file. I see. OK. Honza -- Jan Kara <jack@suse.cz> SUSE Labs, CR ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-19 9:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <54b4548f.X6zUbiROuSfruGuT%akpm@linux-foundation.org>
2015-01-15 10:30 ` + ext2-get-rid-of-most-mentions-of-xip-in-ext2.patch added to -mm tree Jan Kara
2015-01-16 21:09 ` Wilcox, Matthew R
2015-01-19 9:45 ` Jan Kara
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).