Merge branch 'master'

diff --combined fs/Kconfig
index 3a32f3f97e9bda68e2bdb42bdee3fea25f1f39a2,e9749b0eecd8a27e5a1d09ece2eee57e63c14529..14bcce80034670922f87d5de16efeea1a4390da7
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -323,7 -323,6 +323,7 @@@ config FS_POSIX_AC
        default n
  
  source "fs/xfs/Kconfig"
 +source "fs/gfs2/Kconfig"
  
  config OCFS2_FS
        tristate "OCFS2 file system support (EXPERIMENTAL)"
@@@ -884,8 -883,6 +884,6 @@@ config CONFIGFS_F
          Both sysfs and configfs can and should exist together on the
          same system. One is not a replacement for the other.
  
-         If unsure, say N.
- 
  endmenu
  
  menu "Miscellaneous filesystems"
@@@ -1328,7 -1325,7 +1326,7 @@@ config UFS_F
  
  config UFS_FS_WRITE
        bool "UFS file system write support (DANGEROUS)"
-       depends on UFS_FS && EXPERIMENTAL
+       depends on UFS_FS && EXPERIMENTAL && BROKEN
        help
          Say Y here if you want to try writing to UFS partitions. This is
          experimental, so you should back up your UFS partitions beforehand.
@@@ -1831,7 -1828,6 +1829,7 @@@ source "fs/partitions/Kconfig
  endmenu
  
  source "fs/nls/Kconfig"
 +source "fs/dlm/Kconfig"
  
  endmenu
  

diff --combined include/linux/fs.h
index ec09d5ed9aaba1f8df9a8f377ee7566b8ce5c77f,e059da9470076a7af7a2a68e76bd29605369e75a..56e01fb7ecda9e63d5c21b5ea63b9f4f47b781c8
--- 1/include/linux/fs.h
--- 2/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -363,6 -363,8 +363,8 @@@ struct address_space_operations 
                        loff_t offset, unsigned long nr_segs);
        struct page* (*get_xip_page)(struct address_space *, sector_t,
                        int);
+       /* migrate the contents of a page to the specified target */
+       int (*migratepage) (struct page *, struct page *);
  };
  
  struct backing_dev_info;
@@@ -1296,9 -1298,6 +1298,9 @@@ extern struct subsystem fs_subsys
  #define FLOCK_VERIFY_READ  1
  #define FLOCK_VERIFY_WRITE 2
  
 +/* /sys/fs */
 +extern struct subsystem fs_subsys;
 +
  extern int locks_mandatory_locked(struct inode *);
  extern int locks_mandatory_area(int, struct inode *, struct file *, loff_t, size_t);
  
@@@ -1722,6 -1721,12 +1724,12 @@@ extern void simple_release_fs(struct vf
  
  extern ssize_t simple_read_from_buffer(void __user *, size_t, loff_t *, const void *, size_t);
  
+ #ifdef CONFIG_MIGRATION
+ extern int buffer_migrate_page(struct page *, struct page *);
+ #else
+ #define buffer_migrate_page NULL
+ #endif
+ 
  extern int inode_change_ok(struct inode *, struct iattr *);
  extern int __must_check inode_setattr(struct inode *, struct iattr *);