Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-824 corrupted ldiskfs after md rebuild (bz24264)
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_mdc.h
diff --git
a/lustre/include/lustre_mdc.h
b/lustre/include/lustre_mdc.h
index
381a676
..
e8883b4
100644
(file)
--- a/
lustre/include/lustre_mdc.h
+++ b/
lustre/include/lustre_mdc.h
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-58,9
+58,7
@@
# include <linux/posix_acl_xattr.h>
# endif /* HAVE_LINUX_POSIX_ACL_XATTR_H */
# endif /* CONFIG_FS_POSIX_ACL */
# include <linux/posix_acl_xattr.h>
# endif /* HAVE_LINUX_POSIX_ACL_XATTR_H */
# endif /* CONFIG_FS_POSIX_ACL */
-# ifndef HAVE_VFS_INTENT_PATCHES
-# include <linux/lustre_intent.h>
-# endif /* HAVE_VFS_INTENT_PATCHES */
+#include <linux/lustre_intent.h>
#endif /* __KERNEL__ */
#include <lustre_handles.h>
#include <libcfs/libcfs.h>
#endif /* __KERNEL__ */
#include <lustre_handles.h>
#include <libcfs/libcfs.h>