git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
reiserfs
/
xattr_security.c
diff --git
a/fs/reiserfs/xattr_security.c
b/fs/reiserfs/xattr_security.c
index
e044d51
..
5e90a95
100644
(file)
--- a/
fs/reiserfs/xattr_security.c
+++ b/
fs/reiserfs/xattr_security.c
@@
-9,57
+9,55
@@
#define XATTR_SECURITY_PREFIX "security."
static int
#define XATTR_SECURITY_PREFIX "security."
static int
-security_get
(struct inode *inode, const char *name, void *buffer, size_t size)
+security_get(struct inode *inode, const char *name, void *buffer, size_t size)
{
{
- if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
- return -EINVAL;
+
if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
+
return -EINVAL;
- if (is_reiserfs_priv_object(inode))
- return -EPERM;
+
if (is_reiserfs_priv_object(inode))
+
return -EPERM;
-
return reiserfs_xattr_get
(inode, name, buffer, size);
+
return reiserfs_xattr_get
(inode, name, buffer, size);
}
static int
}
static int
-security_set
(struct inode *inode, const char *name, const void *buffer,
- size_t size, int flags)
+security_set(struct inode *inode, const char *name, const void *buffer,
+
size_t size, int flags)
{
{
- if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
- return -EINVAL;
+
if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
+
return -EINVAL;
- if (is_reiserfs_priv_object(inode))
- return -EPERM;
+
if (is_reiserfs_priv_object(inode))
+
return -EPERM;
-
return reiserfs_xattr_set
(inode, name, buffer, size, flags);
+
return reiserfs_xattr_set
(inode, name, buffer, size, flags);
}
}
-static int
-security_del (struct inode *inode, const char *name)
+static int security_del(struct inode *inode, const char *name)
{
{
- if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
- return -EINVAL;
+
if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
+
return -EINVAL;
- if (is_reiserfs_priv_object(inode))
- return -EPERM;
+
if (is_reiserfs_priv_object(inode))
+
return -EPERM;
- return 0;
+
return 0;
}
static int
}
static int
-security_list
(struct inode *inode, const char *name, int namelen, char *out)
+security_list(struct inode *inode, const char *name, int namelen, char *out)
{
{
- int len = namelen;
+
int len = namelen;
- if (is_reiserfs_priv_object(inode))
- return 0;
+
if (is_reiserfs_priv_object(inode))
+
return 0;
- if (out)
-
memcpy
(out, name, len);
+
if (out)
+
memcpy
(out, name, len);
- return len;
+
return len;
}
}
-
struct reiserfs_xattr_handler security_handler = {
.prefix = XATTR_SECURITY_PREFIX,
.get = security_get,
struct reiserfs_xattr_handler security_handler = {
.prefix = XATTR_SECURITY_PREFIX,
.get = security_get,