nfsd4: support putpubfh operation

[safe/jmp/linux-2.6] / fs / btrfs / super.c

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 84c3b66..19a4daf 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -37,7 +37,7 @@
 #include <linux/ctype.h>
 #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"
@@ -51,22 +51,15 @@
 #include "export.h"
 #include "compression.h"
 
-#define BTRFS_SUPER_MAGIC 0x9123683E
 
 static struct super_operations btrfs_super_ops;
 
-static void btrfs_put_super (struct super_block * sb)
+static void btrfs_put_super(struct super_block *sb)
 {
        struct btrfs_root *root = btrfs_sb(sb);
        int ret;
 
        ret = close_ctree(root);
-       if (ret) {
-               printk("close ctree returns %d\n", ret);
-       }
-#if 0
-       btrfs_sysfs_del_super(root->fs_info);
-#endif
        sb->s_fs_info = NULL;
 }
 
@@ -299,12 +292,12 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags,
        return error;
 }
 
-static int btrfs_fill_super(struct super_block * sb,
+static int btrfs_fill_super(struct super_block *sb,
                            struct btrfs_fs_devices *fs_devices,
-                           void * data, int silent)
+                           void *data, int silent)
 {
-       struct inode * inode;
-       struct dentry * root_dentry;
+       struct inode *inode;
+       struct dentry *root_dentry;
        struct btrfs_super_block *disk_super;
        struct btrfs_root *tree_root;
        struct btrfs_inode *bi;
@@ -386,7 +379,6 @@ int btrfs_sync_fs(struct super_block *sb, int wait)
        btrfs_start_delalloc_inodes(root);
        btrfs_wait_ordered_extents(root, 0);
 
-       btrfs_clean_old_snapshots(root);
        trans = btrfs_start_transaction(root, 1);
        ret = btrfs_commit_transaction(trans, root);
        sb->s_dirt = 0;
@@ -429,7 +421,7 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
        error = btrfs_parse_early_options(data, mode, fs_type,
                                          &subvol_name, &fs_devices);
        if (error)
-               goto error;
+               return error;
 
        error = btrfs_scan_one_device(dev_name, mode, fs_type, &fs_devices);
        if (error)
@@ -468,7 +460,7 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
                if (error) {
                        up_write(&s->s_umount);
                        deactivate_super(s);
-                       goto error;
+                       goto error_free_subvol_name;
                }
 
                btrfs_sb(s)->fs_info->bdev_holder = fs_type;
@@ -479,20 +471,22 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
                root = dget(s->s_root);
        else {
                mutex_lock(&s->s_root->d_inode->i_mutex);
-               root = lookup_one_len(subvol_name, s->s_root, strlen(subvol_name));
+               root = lookup_one_len(subvol_name, s->s_root,
+                                     strlen(subvol_name));
                mutex_unlock(&s->s_root->d_inode->i_mutex);
+
                if (IS_ERR(root)) {
                        up_write(&s->s_umount);
                        deactivate_super(s);
                        error = PTR_ERR(root);
-                       goto error;
+                       goto error_free_subvol_name;
                }
                if (!root->d_inode) {
                        dput(root);
                        up_write(&s->s_umount);
                        deactivate_super(s);
                        error = -ENXIO;
-                       goto error;
+                       goto error_free_subvol_name;
                }
        }
 
@@ -508,7 +502,6 @@ error_close_devices:
        btrfs_close_devices(fs_devices);
 error_free_subvol_name:
        kfree(subvol_name);
-error:
        return error;
 }
 
@@ -517,6 +510,10 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data)
        struct btrfs_root *root = btrfs_sb(sb);
        int ret;
 
+       ret = btrfs_parse_options(root, data);
+       if (ret)
+               return -EINVAL;
+
        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
                return 0;
 
@@ -558,8 +555,9 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
        buf->f_bavail = buf->f_bfree;
        buf->f_bsize = dentry->d_sb->s_blocksize;
        buf->f_type = BTRFS_SUPER_MAGIC;
+
        /* We treat it as constant endianness (it doesn't matter _which_)
-          because we want the fsid to come out the same whether mounted 
+          because we want the fsid to come out the same whether mounted
           on a big-endian or little-endian host */
        buf->f_fsid.val[0] = be32_to_cpu(fsid[0]) ^ be32_to_cpu(fsid[2]);
        buf->f_fsid.val[1] = be32_to_cpu(fsid[1]) ^ be32_to_cpu(fsid[3]);
@@ -586,15 +584,20 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
 {
        struct btrfs_ioctl_vol_args *vol;
        struct btrfs_fs_devices *fs_devices;
-       int ret = 0;
-       int len;
+       int ret = -ENOTTY;
+
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
 
        vol = kmalloc(sizeof(*vol), GFP_KERNEL);
+       if (!vol)
+               return -ENOMEM;
+
        if (copy_from_user(vol, (void __user *)arg, sizeof(*vol))) {
                ret = -EFAULT;
                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,
@@ -606,18 +609,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 = {
@@ -632,8 +637,8 @@ static struct super_operations btrfs_super_ops = {
        .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 = {
@@ -656,7 +661,7 @@ static int btrfs_interface_init(void)
 static void btrfs_interface_exit(void)
 {
        if (misc_deregister(&btrfs_misc) < 0)
-               printk("misc_deregister failed for control device");
+               printk(KERN_INFO "misc_deregister failed for control device");
 }
 
 static int __init init_btrfs_fs(void)