Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2...

Conflicts:
	fs/ocfs2/ioctl.c

diff --cc fs/ocfs2/ioctl.c
index 312a28f,5910059..bc91072
--- 1/fs/ocfs2/ioctl.c
--- 2/fs/ocfs2/ioctl.c
+++ b/fs/ocfs2/ioctl.c
@@@ -542,29 -952,8 +952,31 @@@ long ocfs2_ioctl(struct file *filp, uns
                        return -EFAULT;
  
                return ocfs2_info_handle(inode, &info, 0);
 +      case FITRIM:
 +      {
 +              struct super_block *sb = inode->i_sb;
 +              struct fstrim_range range;
 +              int ret = 0;
 +
 +              if (!capable(CAP_SYS_ADMIN))
 +                      return -EPERM;
 +
 +              if (copy_from_user(&range, (struct fstrim_range *)arg,
 +                  sizeof(range)))
 +                      return -EFAULT;
 +
 +              ret = ocfs2_trim_fs(sb, &range);
 +              if (ret < 0)
 +                      return ret;
 +
 +              if (copy_to_user((struct fstrim_range *)arg, &range,
 +                  sizeof(range)))
 +                      return -EFAULT;
 +
 +              return 0;
 +      }
+       case OCFS2_IOC_MOVE_EXT:
+               return ocfs2_ioctl_move_extents(filp, (void __user *)arg);
        default:
                return -ENOTTY;
        }