Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / fs / gfs2 / mount.c

diff --git a/fs/gfs2/mount.c b/fs/gfs2/mount.c
index b66027827aaa26a8110b351c3dc37e101e80db8a..32caecd20300f757671b01e0e972d04a109e9a06 100644 (file)
--- a/fs/gfs2/mount.c
+++ b/fs/gfs2/mount.c
@@ -7,15 +7,14 @@
  * of the GNU General Public License version 2.
  */
 
-#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
+#include <linux/lm_interface.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "mount.h"
 #include "sys.h"
@@ -203,11 +202,11 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, char *data_arg, int remount)
 
        return error;
 
- need_value:
+need_value:
        fs_info(sdp, "need value for option %s\n", o);
        return -EINVAL;
 
- cant_remount:
+cant_remount:
        fs_info(sdp, "can't remount with option %s\n", o);
        return -EINVAL;
 }