projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'net.b0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
[powerpc.git]
/
fs
/
ext3
/
xattr.c
diff --git
a/fs/ext3/xattr.c
b/fs/ext3/xattr.c
index
3f9dfa6
..
e8d60bf
100644
(file)
--- a/
fs/ext3/xattr.c
+++ b/
fs/ext3/xattr.c
@@
-140,7
+140,7
@@
ext3_xattr_handler(int name_index)
/*
* Inode operation listxattr()
*
/*
* Inode operation listxattr()
*
- * dentry->d_inode->i_
sem
: don't care
+ * dentry->d_inode->i_
mutex
: don't care
*/
ssize_t
ext3_listxattr(struct dentry *dentry, char *buffer, size_t size)
*/
ssize_t
ext3_listxattr(struct dentry *dentry, char *buffer, size_t size)
@@
-210,7
+210,7
@@
ext3_xattr_find_entry(struct ext3_xattr_entry **pentry, int name_index,
return cmp ? -ENODATA : 0;
}
return cmp ? -ENODATA : 0;
}
-int
+
static
int
ext3_xattr_block_get(struct inode *inode, int name_index, const char *name,
void *buffer, size_t buffer_size)
{
ext3_xattr_block_get(struct inode *inode, int name_index, const char *name,
void *buffer, size_t buffer_size)
{
@@
-354,7
+354,7
@@
ext3_xattr_list_entries(struct inode *inode, struct ext3_xattr_entry *entry,
return buffer_size - rest;
}
return buffer_size - rest;
}
-int
+
static
int
ext3_xattr_block_list(struct inode *inode, char *buffer, size_t buffer_size)
{
struct buffer_head *bh = NULL;
ext3_xattr_block_list(struct inode *inode, char *buffer, size_t buffer_size)
{
struct buffer_head *bh = NULL;
@@
-626,7
+626,7
@@
struct ext3_xattr_block_find {
struct buffer_head *bh;
};
struct buffer_head *bh;
};
-int
+
static
int
ext3_xattr_block_find(struct inode *inode, struct ext3_xattr_info *i,
struct ext3_xattr_block_find *bs)
{
ext3_xattr_block_find(struct inode *inode, struct ext3_xattr_info *i,
struct ext3_xattr_block_find *bs)
{
@@
-859,7
+859,7
@@
struct ext3_xattr_ibody_find {
struct ext3_iloc iloc;
};
struct ext3_iloc iloc;
};
-int
+
static
int
ext3_xattr_ibody_find(struct inode *inode, struct ext3_xattr_info *i,
struct ext3_xattr_ibody_find *is)
{
ext3_xattr_ibody_find(struct inode *inode, struct ext3_xattr_info *i,
struct ext3_xattr_ibody_find *is)
{
@@
-946,10
+946,6
@@
ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
};
int error;
};
int error;
- if (IS_RDONLY(inode))
- return -EROFS;
- if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
- return -EPERM;
if (!name)
return -EINVAL;
if (strlen(name) > 255)
if (!name)
return -EINVAL;
if (strlen(name) > 255)
@@
-1106,7
+1102,7
@@
cleanup:
void
ext3_xattr_put_super(struct super_block *sb)
{
void
ext3_xattr_put_super(struct super_block *sb)
{
- mb_cache_shrink(
ext3_xattr_cache,
sb->s_bdev);
+ mb_cache_shrink(sb->s_bdev);
}
/*
}
/*