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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
ext2
/
xattr.c
diff --git
a/fs/ext2/xattr.c
b/fs/ext2/xattr.c
index
6069204
..
b7b83fc
100644
(file)
--- a/
fs/ext2/xattr.c
+++ b/
fs/ext2/xattr.c
@@
-326,7
+326,7
@@
cleanup:
/*
* Inode operation listxattr()
*
/*
* Inode operation listxattr()
*
- * dentry->d_inode->i_
sem
: don't care
+ * dentry->d_inode->i_
mutex
: don't care
*/
ssize_t
ext2_listxattr(struct dentry *dentry, char *buffer, size_t size)
*/
ssize_t
ext2_listxattr(struct dentry *dentry, char *buffer, size_t size)
@@
-343,12
+343,9
@@
static void ext2_xattr_update_super_block(struct super_block *sb)
if (EXT2_HAS_COMPAT_FEATURE(sb, EXT2_FEATURE_COMPAT_EXT_ATTR))
return;
if (EXT2_HAS_COMPAT_FEATURE(sb, EXT2_FEATURE_COMPAT_EXT_ATTR))
return;
- lock_super(sb);
- EXT2_SB(sb)->s_es->s_feature_compat |=
- cpu_to_le32(EXT2_FEATURE_COMPAT_EXT_ATTR);
+ EXT2_SET_COMPAT_FEATURE(sb, EXT2_FEATURE_COMPAT_EXT_ATTR);
sb->s_dirt = 1;
mark_buffer_dirty(EXT2_SB(sb)->s_sbh);
sb->s_dirt = 1;
mark_buffer_dirty(EXT2_SB(sb)->s_sbh);
- unlock_super(sb);
}
/*
}
/*
@@
-390,10
+387,6
@@
ext2_xattr_set(struct inode *inode, int name_index, const char *name,
ea_idebug(inode, "name=%d.%s, value=%p, value_len=%ld",
name_index, name, value, (long)value_len);
ea_idebug(inode, "name=%d.%s, value=%p, value_len=%ld",
name_index, name, value, (long)value_len);
- if (IS_RDONLY(inode))
- return -EROFS;
- if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
- return -EPERM;
if (value == NULL)
value_len = 0;
if (name == NULL)
if (value == NULL)
value_len = 0;
if (name == NULL)
@@
-526,11
+519,10
@@
bad_block: ext2_error(sb, "ext2_xattr_set",
}
} else {
/* Allocate a buffer where we construct the new block. */
}
} else {
/* Allocate a buffer where we construct the new block. */
- header = k
m
alloc(sb->s_blocksize, GFP_KERNEL);
+ header = k
z
alloc(sb->s_blocksize, GFP_KERNEL);
error = -ENOMEM;
if (header == NULL)
goto cleanup;
error = -ENOMEM;
if (header == NULL)
goto cleanup;
- memset(header, 0, sb->s_blocksize);
end = (char *)header + sb->s_blocksize;
header->h_magic = cpu_to_le32(EXT2_XATTR_MAGIC);
header->h_blocks = header->h_refcount = cpu_to_le32(1);
end = (char *)header + sb->s_blocksize;
header->h_magic = cpu_to_le32(EXT2_XATTR_MAGIC);
header->h_blocks = header->h_refcount = cpu_to_le32(1);
@@
-651,11
+643,11
@@
ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
ea_bdebug(new_bh, "reusing block");
error = -ENOSPC;
ea_bdebug(new_bh, "reusing block");
error = -ENOSPC;
- if (DLIMIT_ALLOC_BLOCK(
sb, inode->i_xid
, 1))
+ if (DLIMIT_ALLOC_BLOCK(
inode
, 1))
goto cleanup;
error = -EDQUOT;
if (DQUOT_ALLOC_BLOCK(inode, 1)) {
goto cleanup;
error = -EDQUOT;
if (DQUOT_ALLOC_BLOCK(inode, 1)) {
- DLIMIT_FREE_BLOCK(
sb, inode->i_xid
, 1);
+ DLIMIT_FREE_BLOCK(
inode
, 1);
unlock_buffer(new_bh);
goto cleanup;
}
unlock_buffer(new_bh);
goto cleanup;
}
@@
-749,7
+741,7
@@
ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
le32_to_cpu(HDR(old_bh)->h_refcount) - 1);
if (ce)
mb_cache_entry_release(ce);
le32_to_cpu(HDR(old_bh)->h_refcount) - 1);
if (ce)
mb_cache_entry_release(ce);
- DLIMIT_FREE_BLOCK(
sb, inode->i_xid
, 1);
+ DLIMIT_FREE_BLOCK(
inode
, 1);
DQUOT_FREE_BLOCK(inode, 1);
mark_buffer_dirty(old_bh);
ea_bdebug(old_bh, "refcount now=%d",
DQUOT_FREE_BLOCK(inode, 1);
mark_buffer_dirty(old_bh);
ea_bdebug(old_bh, "refcount now=%d",
@@
-802,19
+794,21
@@
ext2_xattr_delete_inode(struct inode *inode)
ext2_free_blocks(inode, EXT2_I(inode)->i_file_acl, 1);
get_bh(bh);
bforget(bh);
ext2_free_blocks(inode, EXT2_I(inode)->i_file_acl, 1);
get_bh(bh);
bforget(bh);
+ unlock_buffer(bh);
} else {
HDR(bh)->h_refcount = cpu_to_le32(
le32_to_cpu(HDR(bh)->h_refcount) - 1);
if (ce)
mb_cache_entry_release(ce);
} else {
HDR(bh)->h_refcount = cpu_to_le32(
le32_to_cpu(HDR(bh)->h_refcount) - 1);
if (ce)
mb_cache_entry_release(ce);
+ ea_bdebug(bh, "refcount now=%d",
+ le32_to_cpu(HDR(bh)->h_refcount));
+ unlock_buffer(bh);
mark_buffer_dirty(bh);
if (IS_SYNC(inode))
sync_dirty_buffer(bh);
mark_buffer_dirty(bh);
if (IS_SYNC(inode))
sync_dirty_buffer(bh);
- DLIMIT_FREE_BLOCK(inode
->i_sb, inode->i_xid
, 1);
+ DLIMIT_FREE_BLOCK(inode, 1);
DQUOT_FREE_BLOCK(inode, 1);
}
DQUOT_FREE_BLOCK(inode, 1);
}
- ea_bdebug(bh, "refcount now=%d", le32_to_cpu(HDR(bh)->h_refcount) - 1);
- unlock_buffer(bh);
EXT2_I(inode)->i_file_acl = 0;
cleanup:
EXT2_I(inode)->i_file_acl = 0;
cleanup:
@@
-830,7
+824,7
@@
cleanup:
void
ext2_xattr_put_super(struct super_block *sb)
{
void
ext2_xattr_put_super(struct super_block *sb)
{
- mb_cache_shrink(
ext2_xattr_cache,
sb->s_bdev);
+ mb_cache_shrink(sb->s_bdev);
}
}