--- linux-2.6.14/fs/xfs/linux-2.6/xfs_iops.c 2005-10-28 20:49:45 +0200 +++ linux-2.6.14-vs2.0.1-pre3/fs/xfs/linux-2.6/xfs_iops.c 2005-10-29 15:38:05 +0200 @@ -482,6 +506,10 @@ linvfs_setattr( int flags = 0; int error; + error = inode_change_ok(inode, attr); + if (error) + return error; + memset(&vattr, 0, sizeof(vattr_t)); if (ia_valid & ATTR_UID) { vattr.va_mask |= XFS_AT_UID; --- linux-2.6.14/fs/sysfs/mount.c 2005-08-29 22:25:33 +0200 +++ linux-2.6.14-vs2.0.1-pre3/fs/sysfs/mount.c 2005-10-29 04:20:01 +0200 @@ -11,8 +11,6 @@ #include "sysfs.h" -/* Random magic number */ -#define SYSFS_MAGIC 0x62656572 struct vfsmount *sysfs_mount; struct super_block * sysfs_sb = NULL; --- linux-2.6.14/mm/shmem.c 2005-10-28 20:49:57 +0200 +++ linux-2.6.14-vs2.0.1-pre3/mm/shmem.c 2005-10-29 04:20:01 +0200 @@ -50,7 +50,6 @@ #include /* 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) --- linux-2.6.14/mm/shmem.c 2005-10-28 20:49:57 +0200 +++ linux-2.6.14-vs2.0.1-pre3/mm/shmem.c 2005-10-29 04:20:01 +0200 @@ -1580,7 +1579,7 @@ static int shmem_statfs(struct super_blo { struct shmem_sb_info *sbinfo = SHMEM_SB(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); --- linux-2.6.14/mm/shmem.c 2005-10-28 20:49:57 +0200 +++ linux-2.6.14-vs2.0.1-pre3/mm/shmem.c 2005-10-29 04:20:01 +0200 @@ -1993,7 +1992,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; inode = shmem_get_inode(sb, S_IFDIR | mode, 0); --- linux-2.6.14/fs/sysfs/mount.c 2005-08-29 22:25:33 +0200 +++ linux-2.6.14-vs2.0.1-pre3/fs/sysfs/mount.c 2005-10-29 04:20:01 +0200 @@ -38,7 +36,7 @@ static int sysfs_fill_super(struct super sb->s_blocksize = PAGE_CACHE_SIZE; sb->s_blocksize_bits = PAGE_CACHE_SHIFT; - sb->s_magic = SYSFS_MAGIC; + sb->s_magic = SYSFS_SUPER_MAGIC; sb->s_op = &sysfs_ops; sb->s_time_gran = 1; sysfs_sb = sb; --- linux-2.6.14/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200 +++ linux-2.6.14-vs2.0.1-pre3/include/linux/devpts_fs.h 2005-10-29 04:20:01 +0200 @@ -30,5 +30,7 @@ static inline void devpts_pty_kill(int n #endif +#define DEVPTS_SUPER_MAGIC 0x00001cd1 + #endif /* _LINUX_DEVPTS_FS_H */ --- linux-2.6.14/include/linux/shmem_fs.h 2004-10-23 05:06:23 +0200 +++ linux-2.6.14-vs2.0.1-pre3/include/linux/shmem_fs.h 2005-10-29 04:20:01 +0200 @@ -8,6 +8,9 @@ #define SHMEM_NR_DIRECT 16 +#define TMPFS_SUPER_MAGIC 0x01021994 + + struct shmem_inode_info { spinlock_t lock; unsigned long flags; --- linux-2.6.14/include/linux/sysfs.h 2005-08-29 22:25:42 +0200 +++ linux-2.6.14-vs2.0.1-pre3/include/linux/sysfs.h 2005-10-29 04:20:01 +0200 @@ -12,6 +12,8 @@ #include +#define SYSFS_SUPER_MAGIC 0x62656572 + struct kobject; struct module;