Merge commit 'linux-pnfs/nfs41-for-2.6.31' into nfsv41-for-2.6.31

[profile/ivi/kernel-x86-ivi.git] / fs / nfs / super.c

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 69804a8..6063054 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1822,6 +1822,7 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
        if (data == NULL)
                return -ENOMEM;
 
+       lock_kernel();
        /* fill out struct with values from existing mount */
        data->flags = nfss->flags;
        data->rsize = nfss->rsize;
@@ -1846,6 +1847,7 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
        error = nfs_compare_remount_data(nfss, data);
 out:
        kfree(data);
+       unlock_kernel();
        return error;
 }