From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Jan 2009 17:32:33 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Tag: v2.6.29-rc2~3
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4b48d9d44ebe0e8c31b4fe3b7480941576fff613;hp=-c;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: fix ioctl arg size (userland incompatible change!)
  Btrfs: Clear the device->running_pending flag before bailing on congestion
---

4b48d9d44ebe0e8c31b4fe3b7480941576fff613
diff --combined fs/btrfs/super.c
index 7256cf242eb,92c9b543def..db9fb3bc1e3
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@@ -38,7 -38,6 +38,7 @@@
  #include <linux/namei.h>
  #include <linux/miscdevice.h>
  #include <linux/version.h>
 +#include <linux/magic.h>
  #include "compat.h"
  #include "ctree.h"
  #include "disk-io.h"
@@@ -52,6 -51,7 +52,6 @@@
  #include "export.h"
  #include "compression.h"
  
 -#define BTRFS_SUPER_MAGIC 0x9123683E
  
  static struct super_operations btrfs_super_ops;
  
@@@ -582,7 -582,7 +582,7 @@@ static long btrfs_control_ioctl(struct 
  {
  	struct btrfs_ioctl_vol_args *vol;
  	struct btrfs_fs_devices *fs_devices;
- 	int ret = 0;
+ 	int ret = -ENOTTY;
  	int len;
  
  	if (!capable(CAP_SYS_ADMIN))
@@@ -594,6 -594,7 +594,7 @@@
  		goto out;
  	}
  	len = strnlen(vol->name, BTRFS_PATH_NAME_MAX);
+ 
  	switch (cmd) {
  	case BTRFS_IOC_SCAN_DEV:
  		ret = btrfs_scan_one_device(vol->name, FMODE_READ,
@@@ -605,20 -606,18 +606,20 @@@ out
  	return ret;
  }
  
 -static void btrfs_write_super_lockfs(struct super_block *sb)
 +static int btrfs_freeze(struct super_block *sb)
  {
  	struct btrfs_root *root = btrfs_sb(sb);
  	mutex_lock(&root->fs_info->transaction_kthread_mutex);
  	mutex_lock(&root->fs_info->cleaner_mutex);
 +	return 0;
  }
  
 -static void btrfs_unlockfs(struct super_block *sb)
 +static int btrfs_unfreeze(struct super_block *sb)
  {
  	struct btrfs_root *root = btrfs_sb(sb);
  	mutex_unlock(&root->fs_info->cleaner_mutex);
  	mutex_unlock(&root->fs_info->transaction_kthread_mutex);
 +	return 0;
  }
  
  static struct super_operations btrfs_super_ops = {
@@@ -633,8 -632,8 +634,8 @@@
  	.destroy_inode	= btrfs_destroy_inode,
  	.statfs		= btrfs_statfs,
  	.remount_fs	= btrfs_remount,
 -	.write_super_lockfs = btrfs_write_super_lockfs,
 -	.unlockfs	= btrfs_unlockfs,
 +	.freeze_fs	= btrfs_freeze,
 +	.unfreeze_fs	= btrfs_unfreeze,
  };
  
  static const struct file_operations btrfs_ctl_fops = {