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

[~andy/linux] / fs / gfs2 / sys.h

diff --git a/fs/gfs2/sys.h b/fs/gfs2/sys.h
index f8c01b50bfba3f788d82281cc4cade2e100df0d3..e94560e836d79d008eb33100e00826952cea6efb 100644 (file)
--- a/fs/gfs2/sys.h
+++ b/fs/gfs2/sys.h
@@ -10,9 +10,8 @@
 #ifndef __SYS_DOT_H__
 #define __SYS_DOT_H__
 
-/* Allow args to be passed to GFS2 when using an initial ram disk */
-extern char *gfs2_sys_margs;
-extern spinlock_t gfs2_sys_margs_lock;
+#include <linux/spinlock.h>
+struct gfs2_sbd;
 
 int gfs2_sys_fs_add(struct gfs2_sbd *sdp);
 void gfs2_sys_fs_del(struct gfs2_sbd *sdp);