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
/
ext2
/
ialloc.c
diff --git
a/fs/ext2/ialloc.c
b/fs/ext2/ialloc.c
index
1b1dce4
..
5aa6769
100644
(file)
--- a/
fs/ext2/ialloc.c
+++ b/
fs/ext2/ialloc.c
@@
-18,9
+18,6
@@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
#include <linux/random.h>
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
#include <linux/random.h>
-#include <linux/vs_base.h>
-#include <linux/vs_dlimit.h>
-
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
@@
-127,7
+124,6
@@
void ext2_free_inode (struct inode * inode)
if (!is_bad_inode(inode)) {
/* Quota is already initialized in iput() */
ext2_xattr_delete_inode(inode);
if (!is_bad_inode(inode)) {
/* Quota is already initialized in iput() */
ext2_xattr_delete_inode(inode);
- DLIMIT_FREE_INODE(sb, inode->i_xid);
DQUOT_FREE_INODE(inode);
DQUOT_DROP(inode);
}
DQUOT_FREE_INODE(inode);
DQUOT_DROP(inode);
}
@@
-469,15
+465,6
@@
struct inode *ext2_new_inode(struct inode *dir, int mode)
if (!inode)
return ERR_PTR(-ENOMEM);
if (!inode)
return ERR_PTR(-ENOMEM);
- if (sb->s_flags & MS_TAGXID)
- inode->i_xid = current->xid;
- else
- inode->i_xid = 0;
-
- if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) {
- err = -ENOSPC;
- goto fail_dlim;
- }
ei = EXT2_I(inode);
sbi = EXT2_SB(sb);
es = sbi->s_es;
ei = EXT2_I(inode);
sbi = EXT2_SB(sb);
es = sbi->s_es;
@@
-634,15
+621,12
@@
got:
return inode;
fail2:
return inode;
fail2:
- DLIMIT_FREE_INODE(sb, inode->i_xid);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
return ERR_PTR(err);
fail:
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
return ERR_PTR(err);
fail:
- DLIMIT_FREE_INODE(sb, inode->i_xid);
-fail_dlim:
make_bad_inode(inode);
iput(inode);
return ERR_PTR(err);
make_bad_inode(inode);
iput(inode);
return ERR_PTR(err);