rpms/kernel/devel kernel.spec, 1.1053, 1.1054 linux-2.6.27-ext4-stable-patch-queue.patch, 1.1, 1.2

Thu Oct 16 16:02:24 UTC 2008

Author: sandeen

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12507

Modified Files:
	kernel.spec linux-2.6.27-ext4-stable-patch-queue.patch 
Log Message:
* Thu Oct 16 2008 Eric Sandeen <sandeen at redhat.com>
- ext4 updates from stable patch queue



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1053
retrieving revision 1.1054
diff -u -r1.1053 -r1.1054

--- kernel.spec	16 Oct 2008 06:35:10 -0000	1.1053
+++ kernel.spec	16 Oct 2008 16:01:54 -0000	1.1054
@@ -1822,6 +1822,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Oct 16 2008 Eric Sandeen <sandeen at redhat.com>
+- ext4 updates from stable patch queue
+
 * Wed Oct 15 2008 Dave Airlie <airlied at redhat.com>
 - radeon-modesetting - fix rs48x
 

linux-2.6.27-ext4-stable-patch-queue.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6.27-ext4-stable-patch-queue.patch
Index: linux-2.6.27-ext4-stable-patch-queue.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.27-ext4-stable-patch-queue.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.27-ext4-stable-patch-queue.patch	13 Oct 2008 18:46:00 -0000	1.1
+++ linux-2.6.27-ext4-stable-patch-queue.patch	16 Oct 2008 16:01:54 -0000	1.2
@@ -1,64 +1,27 @@
-This is a rolled up patch of the changes that were pushed to Linus as
-of 2.6.27-git3.
----
- Documentation/filesystems/ext4.txt   |   19 +-
- Documentation/filesystems/fiemap.txt |  228 ++++++
- Documentation/filesystems/proc.txt   |   73 +-
- MAINTAINERS                          |    5 +-
- fs/Kconfig                           |   88 ++-
- fs/Makefile                          |    2 +-
- fs/ext2/ext2.h                       |    2 +
- fs/ext2/file.c                       |    1 +
- fs/ext2/inode.c                      |    8 +
- fs/ext3/file.c                       |    1 +
- fs/ext3/inode.c                      |    8 +
- fs/ext4/Makefile                     |   10 +-
- fs/ext4/acl.h                        |   12 +-
- fs/ext4/balloc.c                     | 1457 +++-------------------------------
- fs/ext4/bitmap.c                     |    6 +-
- fs/ext4/dir.c                        |   64 +-
- fs/ext4/ext4.h                       |  133 ++--
- fs/ext4/ext4_extents.h               |   15 +
- fs/ext4/ext4_i.h                     |   39 +-
- fs/ext4/ext4_sb.h                    |   25 +-
- fs/ext4/extents.c                    |  281 ++++++-
- fs/ext4/file.c                       |   10 +-
- fs/ext4/fsync.c                      |    7 +-
- fs/ext4/hash.c                       |    8 +-
- fs/ext4/ialloc.c                     |   71 +-
- fs/ext4/inode.c                      |  620 +++++++++------
- fs/ext4/ioctl.c                      |   96 +--
- fs/ext4/mballoc.c                    |  220 ++----
- fs/ext4/mballoc.h                    |    1 -
- fs/ext4/migrate.c                    |   10 +-
- fs/ext4/namei.c                      |  402 +++++-----
- fs/ext4/resize.c                     |   33 +-
- fs/ext4/super.c                      |  315 ++++++--
- fs/ext4/symlink.c                    |    8 +-
- fs/ext4/xattr.c                      |   14 +-
- fs/ext4/xattr.h                      |   12 +-
- fs/ioctl.c                           |  273 +++++++
- fs/jbd2/checkpoint.c                 |   71 ++-
- fs/jbd2/commit.c                     |   32 +-
- fs/jbd2/journal.c                    |  103 ++-
- fs/jbd2/recovery.c                   |    7 +-
- fs/ocfs2/alloc.c                     |    9 -
- fs/ocfs2/alloc.h                     |    9 +
- fs/ocfs2/extent_map.c                |  346 +++++++--
- fs/ocfs2/extent_map.h                |    3 +
- fs/ocfs2/file.c                      |    1 +
- include/linux/ext3_fs.h              |    2 +
- include/linux/fiemap.h               |   64 ++
- include/linux/fs.h                   |   21 +
- include/linux/jbd2.h                 |    8 +-
- include/linux/percpu_counter.h       |   12 +-
- lib/percpu_counter.c                 |    8 +-
- 52 files changed, 2710 insertions(+), 2563 deletions(-)
+Stable ext4 patch queue as of 2ce653ef11f1390abf139eba9eeb9d24d95ad9ec
 
-diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
-index 0d53949..eb154ef 100644
---- a/Documentation/filesystems/ext4.txt
-+++ b/Documentation/filesystems/ext4.txt
+Includes:
+
+# Patches pushed to Linus as of 2.6.27-git3
+pushed-to-linus-2.6.27-git3
+
+ext4__remove_an_old_reference_to_ext4dev
+ext4__fix_kconfig_typo_for_ext4dev
+
+# bug fixes
+ext4__free_ext4_prealloc_space_using_kmem_cache_free
+do_mballoc_init_before_doing_filesystem_recovery
+
+# New patches from Aneesh
+use_an_rb_tree_for_tracking_blocks_freed_during_transaction
+dont_reuse_released_data_blocks_until_transaction_commits
+
+... but not yet the writeback changes
+
+Index: linux-2.6/Documentation/filesystems/ext4.txt
+===================================================================
+--- linux-2.6.orig/Documentation/filesystems/ext4.txt	2008-10-16 10:47:04.961000724 -0500
++++ linux-2.6/Documentation/filesystems/ext4.txt	2008-10-16 10:49:41.965000823 -0500
 @@ -32,9 +32,9 @@ Mailing list: linux-ext4 at vger.kernel.org
      you will need to merge your changes with the version from e2fsprogs
      1.41.x.
@@ -87,7 +50,7 @@
  
    - When comparing performance with other filesystems, remember that
      ext3/4 by default offers higher data integrity guarantees than most.
-@@ -177,6 +177,11 @@ barrier=<0|1(*)>	This enables/disables the use of write barriers in
+@@ -177,6 +177,11 @@ barrier=<0|1(*)>	This enables/disables t
  			your disks are battery-backed in one way or another,
  			disabling barriers may safely improve performance.
  
@@ -99,7 +62,7 @@
  orlov		(*)	This enables the new Orlov block allocator. It is
  			enabled by default.
  
-@@ -218,6 +223,11 @@ errors=remount-ro(*)	Remount the filesystem read-only on an error.
+@@ -218,6 +223,11 @@ errors=remount-ro(*)	Remount the filesys
  errors=continue		Keep going on a filesystem error.
  errors=panic		Panic and halt the machine if an error occurs.
  
@@ -111,7 +74,7 @@
  grpid			Give objects the same group ID as their creator.
  bsdgroups
  
-@@ -252,6 +262,7 @@ stripe=n		Number of filesystem blocks that mballoc will try
+@@ -252,6 +262,7 @@ stripe=n		Number of filesystem blocks th
  delalloc	(*)	Deferring block allocation until write-out time.
  nodelalloc		Disable delayed allocation. Blocks are allocation
  			when data is copied from user to page cache.
@@ -119,11 +82,10 @@
  Data Mode
  =========
  There are 3 different data modes:
-diff --git a/Documentation/filesystems/fiemap.txt b/Documentation/filesystems/fiemap.txt
-new file mode 100644
-index 0000000..1e3defc
---- /dev/null
-+++ b/Documentation/filesystems/fiemap.txt
+Index: linux-2.6/Documentation/filesystems/fiemap.txt
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6/Documentation/filesystems/fiemap.txt	2008-10-16 10:49:41.972001100 -0500
 @@ -0,0 +1,228 @@
 +============
 +Fiemap Ioctl
@@ -353,10 +315,10 @@
 +fiemap_fill_next_extent() returns 0 on success, and 1 when the
 +user-supplied fm_extents array is full. If an error is encountered
 +while copying the extent to user memory, -EFAULT will be returned.
-diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
-index f566ad9..d831d24 100644
---- a/Documentation/filesystems/proc.txt
-+++ b/Documentation/filesystems/proc.txt
+Index: linux-2.6/Documentation/filesystems/proc.txt
+===================================================================
+--- linux-2.6.orig/Documentation/filesystems/proc.txt	2008-10-16 10:47:04.962064525 -0500
++++ linux-2.6/Documentation/filesystems/proc.txt	2008-10-16 10:49:42.018337123 -0500
 @@ -923,45 +923,44 @@ CPUs.
  The   "procs_blocked" line gives  the  number of  processes currently blocked,
  waiting for I/O to complete.
@@ -439,10 +401,10 @@
  
  ------------------------------------------------------------------------------
  Summary
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 8dae455..dce9cb9 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
+Index: linux-2.6/MAINTAINERS
+===================================================================
+--- linux-2.6.orig/MAINTAINERS	2008-10-16 10:47:04.962064525 -0500
++++ linux-2.6/MAINTAINERS	2008-10-16 10:49:42.060295977 -0500
 @@ -1639,9 +1639,10 @@ L:	linux-ext4 at vger.kernel.org
  S:	Maintained
  
@@ -456,10 +418,10 @@
  S:	Maintained
  
  F71805F HARDWARE MONITORING DRIVER
-diff --git a/fs/Kconfig b/fs/Kconfig
-index abccb5d..f54a157 100644
---- a/fs/Kconfig
-+++ b/fs/Kconfig
+Index: linux-2.6/fs/Kconfig
+===================================================================
+--- linux-2.6.orig/fs/Kconfig	2008-10-16 10:47:04.962064525 -0500
++++ linux-2.6/fs/Kconfig	2008-10-16 10:49:43.591001419 -0500
 @@ -136,37 +136,51 @@ config EXT3_FS_SECURITY
  	  If you are not using a security module that requires using
  	  extended attributes for file security labels, say N.
@@ -505,7 +467,8 @@
 +	  filesystem initially.
  
  	  To compile this file system support as a module, choose M here. The
- 	  module will be called ext4dev.
+-	  module will be called ext4dev.
++	  module will be called ext4.
  
  	  If unsure, say N.
  
@@ -609,24 +572,24 @@
  
  config REISERFS_FS
  	tristate "Reiserfs support"
-diff --git a/fs/Makefile b/fs/Makefile
-index a1482a5..de404b0 100644
[...3584 lines suppressed...]
 +		goto out;
 +	}
- 
--		ocfs2_extent_map_insert_rec(inode, rec);
++
 +	if (rec.e_blkno == 0ULL) {
 +		/*
 +		 * A hole was found. Return some canned values that
@@ -8866,7 +9165,7 @@
  	}
  
  	if (extent_flags)
-@@ -478,7 +608,6 @@ int ocfs2_get_clusters(struct inode *inode, u32 v_cluster,
+@@ -478,7 +608,6 @@ int ocfs2_get_clusters(struct inode *ino
  
  out:
  	brelse(di_bh);
@@ -8874,7 +9173,7 @@
  	return ret;
  }
  
-@@ -521,3 +650,114 @@ int ocfs2_extent_map_get_blocks(struct inode *inode, u64 v_blkno, u64 *p_blkno,
+@@ -521,3 +650,114 @@ int ocfs2_extent_map_get_blocks(struct i
  out:
  	return ret;
  }
@@ -8989,11 +9288,11 @@
 +
 +	return ret;
 +}
-diff --git a/fs/ocfs2/extent_map.h b/fs/ocfs2/extent_map.h
-index de91e3e..1b97490 100644
---- a/fs/ocfs2/extent_map.h
-+++ b/fs/ocfs2/extent_map.h
-@@ -50,4 +50,7 @@ int ocfs2_get_clusters(struct inode *inode, u32 v_cluster, u32 *p_cluster,
+Index: linux-2.6/fs/ocfs2/extent_map.h
+===================================================================
+--- linux-2.6.orig/fs/ocfs2/extent_map.h	2008-10-16 10:47:05.040064375 -0500
++++ linux-2.6/fs/ocfs2/extent_map.h	2008-10-16 10:49:43.280577130 -0500
+@@ -50,4 +50,7 @@ int ocfs2_get_clusters(struct inode *ino
  int ocfs2_extent_map_get_blocks(struct inode *inode, u64 v_blkno, u64 *p_blkno,
  				u64 *ret_count, unsigned int *extent_flags);
  
@@ -9001,11 +9300,11 @@
 +		 u64 map_start, u64 map_len);
 +
  #endif  /* _EXTENT_MAP_H */
-diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
-index ec2ed15..ed38796 100644
---- a/fs/ocfs2/file.c
-+++ b/fs/ocfs2/file.c
-@@ -2228,6 +2228,7 @@ const struct inode_operations ocfs2_file_iops = {
+Index: linux-2.6/fs/ocfs2/file.c
+===================================================================
+--- linux-2.6.orig/fs/ocfs2/file.c	2008-10-16 10:47:05.040064375 -0500
++++ linux-2.6/fs/ocfs2/file.c	2008-10-16 10:49:43.316000767 -0500
+@@ -2228,6 +2228,7 @@ const struct inode_operations ocfs2_file
  	.getattr	= ocfs2_getattr,
  	.permission	= ocfs2_permission,
  	.fallocate	= ocfs2_fallocate,
@@ -9013,11 +9312,11 @@
  };
  
  const struct inode_operations ocfs2_special_file_iops = {
-diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
-index 80171ee..8120fa1 100644
---- a/include/linux/ext3_fs.h
-+++ b/include/linux/ext3_fs.h
-@@ -837,6 +837,8 @@ extern void ext3_truncate (struct inode *);
+Index: linux-2.6/include/linux/ext3_fs.h
+===================================================================
+--- linux-2.6.orig/include/linux/ext3_fs.h	2008-10-16 10:47:05.040064375 -0500
++++ linux-2.6/include/linux/ext3_fs.h	2008-10-16 10:49:43.358001103 -0500
+@@ -837,6 +837,8 @@ extern void ext3_truncate (struct inode 
  extern void ext3_set_inode_flags(struct inode *);
  extern void ext3_get_inode_flags(struct ext3_inode_info *);
  extern void ext3_set_aops(struct inode *inode);
@@ -9026,11 +9325,10 @@
  
  /* ioctl.c */
  extern int ext3_ioctl (struct inode *, struct file *, unsigned int,
-diff --git a/include/linux/fiemap.h b/include/linux/fiemap.h
-new file mode 100644
-index 0000000..671decb
---- /dev/null
-+++ b/include/linux/fiemap.h
+Index: linux-2.6/include/linux/fiemap.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6/include/linux/fiemap.h	2008-10-16 10:49:43.374287390 -0500
 @@ -0,0 +1,64 @@
 +/*
 + * FS_IOC_FIEMAP ioctl infrastructure.
@@ -9096,10 +9394,10 @@
 +						    * merged for efficiency. */
 +
 +#endif /* _LINUX_FIEMAP_H */
-diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 580b513..385c9a1 100644
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
+Index: linux-2.6/include/linux/fs.h
+===================================================================
+--- linux-2.6.orig/include/linux/fs.h	2008-10-16 10:47:05.075001293 -0500
++++ linux-2.6/include/linux/fs.h	2008-10-16 10:49:43.395000940 -0500
 @@ -231,6 +231,7 @@ extern int dir_notify_enable;
  #define	FS_IOC_SETFLAGS			_IOW('f', 2, long)
  #define	FS_IOC_GETVERSION		_IOR('v', 1, long)
@@ -9116,7 +9414,7 @@
  
  #include <asm/atomic.h>
  #include <asm/byteorder.h>
-@@ -1179,6 +1181,20 @@ extern void dentry_unhash(struct dentry *dentry);
+@@ -1179,6 +1181,20 @@ extern void dentry_unhash(struct dentry 
  extern int file_permission(struct file *, int);
  
  /*
@@ -9146,7 +9444,7 @@
  };
  
  struct seq_file;
-@@ -1980,6 +1998,9 @@ extern int vfs_fstat(unsigned int, struct kstat *);
+@@ -1980,6 +1998,9 @@ extern int vfs_fstat(unsigned int, struc
  
  extern int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
  		    unsigned long arg);
@@ -9156,10 +9454,10 @@
  
  extern void get_filesystem(struct file_system_type *fs);
  extern void put_filesystem(struct file_system_type *fs);
-diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
-index 3dd2090..d2e91ea 100644
---- a/include/linux/jbd2.h
-+++ b/include/linux/jbd2.h
+Index: linux-2.6/include/linux/jbd2.h
+===================================================================
+--- linux-2.6.orig/include/linux/jbd2.h	2008-10-16 10:47:05.080000985 -0500
++++ linux-2.6/include/linux/jbd2.h	2008-10-16 10:49:43.451001226 -0500
 @@ -850,7 +850,8 @@ struct journal_s
  	 */
  	struct block_device	*j_dev;
@@ -9180,7 +9478,7 @@
  
  /*
   * Function declarations for the journaling transaction and buffer
-@@ -1059,7 +1063,7 @@ extern void	   jbd2_journal_clear_features
+@@ -1059,7 +1063,7 @@ extern void	   jbd2_journal_clear_featur
  		   (journal_t *, unsigned long, unsigned long, unsigned long);
  extern int	   jbd2_journal_create     (journal_t *);
  extern int	   jbd2_journal_load       (journal_t *journal);
@@ -9189,11 +9487,11 @@
  extern int	   jbd2_journal_recover    (journal_t *journal);
  extern int	   jbd2_journal_wipe       (journal_t *, int);
  extern int	   jbd2_journal_skip_recovery	(journal_t *);
-diff --git a/include/linux/percpu_counter.h b/include/linux/percpu_counter.h
-index 2083888..9007ccd 100644
---- a/include/linux/percpu_counter.h
-+++ b/include/linux/percpu_counter.h
-@@ -35,7 +35,7 @@ int percpu_counter_init_irq(struct percpu_counter *fbc, s64 amount);
+Index: linux-2.6/include/linux/percpu_counter.h
+===================================================================
+--- linux-2.6.orig/include/linux/percpu_counter.h	2008-10-16 10:47:05.081064215 -0500
++++ linux-2.6/include/linux/percpu_counter.h	2008-10-16 10:49:43.508001156 -0500
+@@ -35,7 +35,7 @@ int percpu_counter_init_irq(struct percp
  void percpu_counter_destroy(struct percpu_counter *fbc);
  void percpu_counter_set(struct percpu_counter *fbc, s64 amount);
  void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch);
@@ -9202,7 +9500,7 @@
  
  static inline void percpu_counter_add(struct percpu_counter *fbc, s64 amount)
  {
-@@ -44,19 +44,13 @@ static inline void percpu_counter_add(struct percpu_counter *fbc, s64 amount)
+@@ -44,19 +44,13 @@ static inline void percpu_counter_add(st
  
  static inline s64 percpu_counter_sum_positive(struct percpu_counter *fbc)
  {
@@ -9224,10 +9522,10 @@
  }
  
  static inline s64 percpu_counter_read(struct percpu_counter *fbc)
-diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
-index 4a8ba4b..a866389 100644
---- a/lib/percpu_counter.c
-+++ b/lib/percpu_counter.c
+Index: linux-2.6/lib/percpu_counter.c
+===================================================================
+--- linux-2.6.orig/lib/percpu_counter.c	2008-10-16 10:47:05.081064215 -0500
++++ linux-2.6/lib/percpu_counter.c	2008-10-16 10:49:43.558206422 -0500
 @@ -52,7 +52,7 @@ EXPORT_SYMBOL(__percpu_counter_add);
   * Add up all the per-cpu counts, return the result.  This is a more accurate
   * but much slower version of percpu_counter_read_positive()
@@ -9237,7 +9535,7 @@
  {
  	s64 ret;
  	int cpu;
-@@ -62,11 +62,9 @@ s64 __percpu_counter_sum(struct percpu_counter *fbc, int set)
+@@ -62,11 +62,9 @@ s64 __percpu_counter_sum(struct percpu_c
  	for_each_online_cpu(cpu) {
  		s32 *pcount = per_cpu_ptr(fbc->counters, cpu);
  		ret += *pcount;


