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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
fs
/
ext3
/
xattr.c
diff --git
a/fs/ext3/xattr.c
b/fs/ext3/xattr.c
index
b6c382c
..
e818bee
100644
(file)
--- a/
fs/ext3/xattr.c
+++ b/
fs/ext3/xattr.c
@@
-59,7
+59,6
@@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
#include <linux/rwsem.h>
#include <linux/mbcache.h>
#include <linux/quotaops.h>
#include <linux/rwsem.h>
-#include <linux/vs_dlimit.h>
#include "xattr.h"
#include "acl.h"
#include "xattr.h"
#include "acl.h"
@@
-762,12
+761,8
@@
ext3_xattr_set_handle2(handle_t *handle, struct inode *inode,
the inode. */
ea_bdebug(new_bh, "reusing block");
the inode. */
ea_bdebug(new_bh, "reusing block");
- error = -ENOSPC;
- if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, 1))
- goto cleanup;
error = -EDQUOT;
if (DQUOT_ALLOC_BLOCK(inode, 1)) {
error = -EDQUOT;
if (DQUOT_ALLOC_BLOCK(inode, 1)) {
- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1);
unlock_buffer(new_bh);
journal_release_buffer(handle, new_bh,
credits);
unlock_buffer(new_bh);
journal_release_buffer(handle, new_bh,
credits);
@@
-791,8
+786,8
@@
ext3_xattr_set_handle2(handle_t *handle, struct inode *inode,
EXT3_SB(sb)->s_es->s_first_data_block) +
EXT3_I(inode)->i_block_group *
EXT3_BLOCKS_PER_GROUP(sb);
EXT3_SB(sb)->s_es->s_first_data_block) +
EXT3_I(inode)->i_block_group *
EXT3_BLOCKS_PER_GROUP(sb);
- int block = ext3_new_block(handle,
inode, goal,
-
NULL, NULL
, &error);
+ int block = ext3_new_block(handle,
+
inode, goal, 0, 0
, &error);
if (error)
goto cleanup;
ea_idebug(inode, "creating block %d", block);
if (error)
goto cleanup;
ea_idebug(inode, "creating block %d", block);
@@
-853,7
+848,6
@@
getblk_failed:
/* Decrement the refcount only. */
HDR(old_bh)->h_refcount = cpu_to_le32(
le32_to_cpu(HDR(old_bh)->h_refcount) - 1);
/* Decrement the refcount only. */
HDR(old_bh)->h_refcount = cpu_to_le32(
le32_to_cpu(HDR(old_bh)->h_refcount) - 1);
- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1);
DQUOT_FREE_BLOCK(inode, 1);
ext3_journal_dirty_metadata(handle, old_bh);
ea_bdebug(old_bh, "refcount now=%d",
DQUOT_FREE_BLOCK(inode, 1);
ext3_journal_dirty_metadata(handle, old_bh);
ea_bdebug(old_bh, "refcount now=%d",
@@
-945,7
+939,6
@@
ext3_xattr_delete_inode(handle_t *handle, struct inode *inode)
ext3_journal_dirty_metadata(handle, bh);
if (IS_SYNC(inode))
handle->h_sync = 1;
ext3_journal_dirty_metadata(handle, bh);
if (IS_SYNC(inode))
handle->h_sync = 1;
- DLIMIT_FREE_BLOCK(inode->i_sb, inode->i_xid, 1);
DQUOT_FREE_BLOCK(inode, 1);
}
ea_bdebug(bh, "refcount now=%d", le32_to_cpu(HDR(bh)->h_refcount) - 1);
DQUOT_FREE_BLOCK(inode, 1);
}
ea_bdebug(bh, "refcount now=%d", le32_to_cpu(HDR(bh)->h_refcount) - 1);