projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[cascardo/linux.git]
/
drivers
/
staging
/
lustre
/
lustre
/
llite
/
symlink.c
diff --git
a/drivers/staging/lustre/lustre/llite/symlink.c
b/drivers/staging/lustre/lustre/llite/symlink.c
index
47fb799
..
82c7c48
100644
(file)
--- a/
drivers/staging/lustre/lustre/llite/symlink.c
+++ b/
drivers/staging/lustre/lustre/llite/symlink.c
@@
-35,7
+35,6
@@
#include <linux/stat.h>
#define DEBUG_SUBSYSTEM S_LLITE
#include <linux/stat.h>
#define DEBUG_SUBSYSTEM S_LLITE
-#include "../include/lustre_lite.h"
#include "llite_internal.h"
static int ll_readlink_internal(struct inode *inode,
#include "llite_internal.h"
static int ll_readlink_internal(struct inode *inode,
@@
-155,8
+154,5
@@
const struct inode_operations ll_fast_symlink_inode_operations = {
.get_link = ll_get_link,
.getattr = ll_getattr,
.permission = ll_inode_permission,
.get_link = ll_get_link,
.getattr = ll_getattr,
.permission = ll_inode_permission,
- .setxattr = generic_setxattr,
- .getxattr = generic_getxattr,
.listxattr = ll_listxattr,
.listxattr = ll_listxattr,
- .removexattr = generic_removexattr,
};
};