On Wed January 9 2008 16:09, Michael S. Zick wrote:
> On Wed January 9 2008 15:35, [EMAIL PROTECTED] wrote:
> >
> > Hello Michael,
> >
> > "Michael S. Zick":
> > > There is no #define TEMPFS_MAGIC in mm/shmem.c of 2.6.24-rc6
> > > The comment about it being used by glibc remains, but the define is
> > > _gone_.
> >
> > I downloaded
> > ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.24-rc6.tar.bz2
> > just now, and found there still exists the definition of TEMPFS_MAGIC in
> > mm/shmem.c.
> >
>
> Strange.
> Will check the source tree I am building against the original kernel tarball.
> It must be some sort of local error here. Read error in my CVS drive?
>
Extra Strange. It is a local change, something "patched" its name yesterday:
Sorry for the noise on the list, gotta check for cockpit error now.
wolf686 mm $ cvs diff -r1.1 shmem.c
Index: shmem.c
===================================================================
RCS file: /home/mszick/cvs/2.6.24-rc6/mm/shmem.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shmem.c 21 Dec 2007 01:25:48 -0000 1.1
+++ shmem.c 8 Jan 2008 21:14:47 -0000 1.2
@@ -55,7 +55,6 @@
#include <asm/pgtable.h>
/* This magic number is used in glibc for posix shared memory */
-#define TMPFS_MAGIC 0x01021994
#define ENTRIES_PER_PAGE (PAGE_CACHE_SIZE/sizeof(unsigned long))
#define ENTRIES_PER_PAGEPAGE (ENTRIES_PER_PAGE*ENTRIES_PER_PAGE)
@@ -1723,7 +1722,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
- buf->f_type = TMPFS_MAGIC;
+ buf->f_type = TMPFS_SUPER_MAGIC;
buf->f_bsize = PAGE_CACHE_SIZE;
buf->f_namelen = NAME_MAX;
spin_lock(&sbinfo->stat_lock);
@@ -2288,7 +2287,7 @@ static int shmem_fill_super(struct super
sb->s_maxbytes = SHMEM_MAX_BYTES;
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
- sb->s_magic = TMPFS_MAGIC;
+ sb->s_magic = TMPFS_SUPER_MAGIC;
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_POSIX_ACL
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
