From: Pekka Enberg <[EMAIL PROTECTED]>
Move REVOKEFS_MAGIC to <linux/magic.h> where it belongs.
Signed-off-by: Pekka Enberg <[EMAIL PROTECTED]>
---
fs/revoke.c | 1 +
include/linux/magic.h | 1 +
include/linux/revoked_fs_i.h | 2 --
3 files changed, 2 insertions(+), 2 deletions(-)
Index: uml-2.6/include/linux/magic.h
===================================================================
--- uml-2.6.orig/include/linux/magic.h 2007-03-16 09:01:07.000000000 +0200
+++ uml-2.6/include/linux/magic.h 2007-03-16 09:01:50.000000000 +0200
@@ -34,6 +34,7 @@ #define REISERFS_SUPER_MAGIC 0x52654973
#define REISERFS_SUPER_MAGIC_STRING "ReIsErFs"
#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs"
+#define REVOKEFS_MAGIC 0x5245564B /* REVK */
#define SMB_SUPER_MAGIC 0x517B
#define USBDEVICE_SUPER_MAGIC 0x9fa2
Index: uml-2.6/include/linux/revoked_fs_i.h
===================================================================
--- uml-2.6.orig/include/linux/revoked_fs_i.h 2007-03-16 09:01:12.000000000
+0200
+++ uml-2.6/include/linux/revoked_fs_i.h 2007-03-16 09:01:21.000000000
+0200
@@ -1,8 +1,6 @@
#ifndef _LINUX_REVOKED_FS_I_H
#define _LINUX_REVOKED_FS_I_H
-#define REVOKEFS_MAGIC 0x5245564B /* REVK */
-
struct revokefs_inode_info {
struct task_struct *owner;
struct file *file;
Index: uml-2.6/fs/revoke.c
===================================================================
--- uml-2.6.orig/fs/revoke.c 2007-03-16 09:01:59.000000000 +0200
+++ uml-2.6/fs/revoke.c 2007-03-16 09:02:08.000000000 +0200
@@ -9,6 +9,7 @@ * Copyright (C) 2006-2007 Pekka Enberg
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/namei.h>
+#include <linux/magic.h>
#include <linux/mm.h>
#include <linux/mman.h>
#include <linux/module.h>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
