Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (43 commits)
  ext4: Rename ext4dev to ext4
  ext4: Avoid double dirtying of super block in ext4_put_super()
  Update ext4 MAINTAINERS file
  Hook ext4 to the vfs fiemap interface.
  generic block based fiemap implementation
  ocfs2: fiemap support
  vfs: vfs-level fiemap interface
  ext4: fix xattr deadlock
  jbd2: Fix buffer head leak when writing the commit block
  ext4: Add debugging markers that can be used by systemtap
  jbd2: abort instead of waiting for nonexistent transaction
  ext4: fix initialization of UNINIT bitmap blocks
  ext4: Remove old legacy block allocator
  ext4: Use readahead when reading an inode from the inode table
  ext4: Improve the documentation for ext4's /proc tunables
  ext4: Combine proc file handling into a single set of functions
  ext4: move /proc setup and teardown out of mballoc.c
  ext4: Don't use 'struct dentry' for internal lookups
  ext4/jbd2: Avoid WARN() messages when failing to write to the superblock
  ext4: use percpu data structures for lg_prealloc_list
  ...

diff --combined MAINTAINERS
index 68781ed2b7346902897f6aea46524a76c029185f,dce9cb960e42d002d28de3abcca8189f249f3f70..587f418ed00d46eceb92cf6251e3c49d1d87c029
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -387,7 -387,6 +387,7 @@@ AMD IOMMU (AMD-VI
  P:    Joerg Roedel
  M:    joerg.roedel@amd.com
  L:    iommu@lists.linux-foundation.org
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
  S:    Supported
  
  AMS (Apple Motion Sensor) DRIVER
@@@ -467,12 -466,6 +467,12 @@@ M:       kernel@wantstofly.or
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  
 +ARM/AFEB9260 MACHINE SUPPORT
 +P:    Sergey Lapin
 +M:    slapin@ossfans.org
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +S:    Maintained
 +
  ARM/AJECO 1ARM MACHINE SUPPORT
  P:    Lennert Buytenhek
  M:    kernel@wantstofly.org
@@@ -498,7 -491,7 +498,7 @@@ M: kernel@wantstofly.or
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  
 -ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
 +ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
  P:    Mike Rapoport
  M:    mike@compulab.co.il
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
@@@ -630,12 -623,6 +630,12 @@@ M:       marek.vasut@gmail.co
  W:    http://hackndev.com
  S:    Maintained
  
 +ARM/PALMZ72 SUPPORT
 +P:     Sergey Lapin
 +M:     slapin@ossfans.org
 +W:     http://hackndev.com
 +S:     Maintained
 +
  ARM/PLEB SUPPORT
  P:    Peter Chubb
  M:    pleb@gelato.unsw.edu.au
@@@ -1061,13 -1048,6 +1061,13 @@@ L:    cbe-oss-dev@ozlabs.or
  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  
 +CISCO 10G ETHERNET DRIVER
 +P:    Scott Feldman
 +M:    scofeldm@cisco.com
 +P:    Joe Eykholt
 +M:    jeykholt@cisco.com
 +S:    Supported
 +
  CFAG12864B LCD DRIVER
  P:    Miguel Ojeda Sandonis
  M:    miguel.ojeda.sandonis@gmail.com
@@@ -1659,9 -1639,10 +1659,10 @@@ L:    linux-ext4@vger.kernel.or
  S:    Maintained
  
  EXT4 FILE SYSTEM
- P:    Stephen Tweedie, Andrew Morton
- M:    sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com
+ P:    Theodore Ts'o
+ M:    tytso@mit.edu, adilger@sun.com
  L:    linux-ext4@vger.kernel.org
+ W:    http://ext4.wiki.kernel.org
  S:    Maintained
  
  F71805F HARDWARE MONITORING DRIVER
@@@ -2339,12 -2320,6 +2340,12 @@@ L:    video4linux-list@redhat.co
  W:    http://www.ivtvdriver.org
  S:    Maintained
  
 +JME NETWORK DRIVER
 +P:    Guo-Fu Tseng
 +M:    cooldavid@cooldavid.org
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +
  JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
  P:    David Woodhouse
  M:    dwmw2@infradead.org
@@@ -3410,13 -3385,6 +3411,13 @@@ M:    linux-driver@qlogic.co
  L:    netdev@vger.kernel.org
  S:    Supported
  
 +QLOGIC QLGE 10Gb ETHERNET DRIVER
 +P:    Ron Mercer
 +M:    linux-driver@qlogic.com
 +M:    ron.mercer@qlogic.com
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +
  QNX4 FILESYSTEM
  P:    Anders Larsen
  M:    al@alarsen.net
@@@ -3682,9 -3650,8 +3683,9 @@@ M:      jmorris@namei.or
  P:    Eric Paris
  M:    eparis@parisplace.org
  L:    linux-kernel@vger.kernel.org (kernel issues)
 -L:    selinux@tycho.nsa.gov (subscribers-only, general discussion)
 -W:    http://www.nsa.gov/selinux
 +L:    selinux@tycho.nsa.gov (subscribers-only, general discussion)
 +W:    http://selinuxproject.org
 +T:    git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
  S:    Supported
  
  SENSABLE PHANTOM
@@@ -3861,8 -3828,6 +3862,8 @@@ S:      Maintaine
  SOUND
  P:    Jaroslav Kysela
  M:    perex@perex.cz
 +P:    Takashi Iwai
 +M:    tiwai@suse.de
  L:    alsa-devel@alsa-project.org (subscribers-only)
  S:    Maintained
  
@@@ -4369,12 -4334,6 +4370,12 @@@ L:    linux-usb@vger.kernel.or
  W:    http://www.connecttech.com
  S:    Supported
  
 +USB SMSC95XX ETHERNET DRIVER
 +P:    Steve Glendinning
 +M:    steve.glendinning@smsc.com
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +
  USB SN9C1xx DRIVER
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it

diff --combined include/linux/fs.h
index 32477e8872d544ce9abeca8cde1b603d4739814d,385c9a197df1a93c684235037d0097d938caaa56..44e3cb2f1966d86b4a422fa616b97f485a150c95
--- 1/include/linux/fs.h
--- 2/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -86,9 -86,7 +86,9 @@@ extern int dir_notify_enable
  #define READ_META     (READ | (1 << BIO_RW_META))
  #define WRITE_SYNC    (WRITE | (1 << BIO_RW_SYNC))
  #define SWRITE_SYNC   (SWRITE | (1 << BIO_RW_SYNC))
 -#define WRITE_BARRIER ((1 << BIO_RW) | (1 << BIO_RW_BARRIER))
 +#define WRITE_BARRIER (WRITE | (1 << BIO_RW_BARRIER))
 +#define DISCARD_NOBARRIER (1 << BIO_RW_DISCARD)
 +#define DISCARD_BARRIER ((1 << BIO_RW_DISCARD) | (1 << BIO_RW_BARRIER))
  
  #define SEL_IN                1
  #define SEL_OUT               2
@@@ -224,7 -222,6 +224,7 @@@
  #define BLKTRACESTART _IO(0x12,116)
  #define BLKTRACESTOP _IO(0x12,117)
  #define BLKTRACETEARDOWN _IO(0x12,118)
 +#define BLKDISCARD _IO(0x12,119)
  
  #define BMAP_IOCTL 1          /* obsolete - kept for compatibility */
  #define FIBMAP           _IO(0x00,1)  /* bmap access */
@@@ -234,6 -231,7 +234,7 @@@
  #define       FS_IOC_SETFLAGS                 _IOW('f', 2, long)
  #define       FS_IOC_GETVERSION               _IOR('v', 1, long)
  #define       FS_IOC_SETVERSION               _IOW('v', 2, long)
+ #define FS_IOC_FIEMAP                 _IOWR('f', 11, struct fiemap)
  #define FS_IOC32_GETFLAGS             _IOR('f', 1, int)
  #define FS_IOC32_SETFLAGS             _IOW('f', 2, int)
  #define FS_IOC32_GETVERSION           _IOR('v', 1, int)
@@@ -294,6 -292,7 +295,7 @@@
  #include <linux/mutex.h>
  #include <linux/capability.h>
  #include <linux/semaphore.h>
+ #include <linux/fiemap.h>
  
  #include <asm/atomic.h>
  #include <asm/byteorder.h>
@@@ -1181,6 -1180,20 +1183,20 @@@ extern void dentry_unhash(struct dentr
   */
  extern int file_permission(struct file *, int);
  
+ /*
+  * VFS FS_IOC_FIEMAP helper definitions.
+  */
+ struct fiemap_extent_info {
+       unsigned int fi_flags;          /* Flags as passed from user */
+       unsigned int fi_extents_mapped; /* Number of mapped extents */
+       unsigned int fi_extents_max;    /* Size of fiemap_extent array */
+       struct fiemap_extent *fi_extents_start; /* Start of fiemap_extent
+                                                * array */
+ };
+ int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
+                           u64 phys, u64 len, u32 flags);
+ int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags);
+ 
  /*
   * File types
   *
@@@ -1290,6 -1303,8 +1306,8 @@@ struct inode_operations 
        void (*truncate_range)(struct inode *, loff_t, loff_t);
        long (*fallocate)(struct inode *inode, int mode, loff_t offset,
                          loff_t len);
+       int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
+                     u64 len);
  };
  
  struct seq_file;
@@@ -1685,7 -1700,6 +1703,7 @@@ extern void chrdev_show(struct seq_fil
  
  /* fs/block_dev.c */
  #define BDEVNAME_SIZE 32      /* Largest string for a blockdev identifier */
 +#define BDEVT_SIZE    10      /* Largest string for MAJ:MIN for blkdev */
  
  #ifdef CONFIG_BLOCK
  #define BLKDEV_MAJOR_HASH_SIZE        255
@@@ -1722,9 -1736,6 +1740,9 @@@ extern int fs_may_remount_ro(struct sup
   */
  #define bio_data_dir(bio)     ((bio)->bi_rw & 1)
  
 +extern void check_disk_size_change(struct gendisk *disk,
 +                                 struct block_device *bdev);
 +extern int revalidate_disk(struct gendisk *);
  extern int check_disk_change(struct block_device *);
  extern int __invalidate_device(struct block_device *);
  extern int invalidate_partition(struct gendisk *, int);
@@@ -1987,6 -1998,9 +2005,9 @@@ extern int vfs_fstat(unsigned int, stru
  
  extern int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
                    unsigned long arg);
+ extern int generic_block_fiemap(struct inode *inode,
+                               struct fiemap_extent_info *fieinfo, u64 start,
+                               u64 len, get_block_t *get_block);
  
  extern void get_filesystem(struct file_system_type *fs);
  extern void put_filesystem(struct file_system_type *fs);