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
vserver 2.0 rc7
[linux-2.6.git]
/
fs
/
ext2
/
ialloc.c
diff --git
a/fs/ext2/ialloc.c
b/fs/ext2/ialloc.c
index
9930970
..
0886ddc
100644
(file)
--- a/
fs/ext2/ialloc.c
+++ b/
fs/ext2/ialloc.c
@@
-19,7
+19,7
@@
#include <linux/buffer_head.h>
#include <linux/random.h>
#include <linux/vs_dlimit.h>
#include <linux/buffer_head.h>
#include <linux/random.h>
#include <linux/vs_dlimit.h>
-
+#include <linux/vserver/xid.h>
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
@@
-468,11
+468,7
@@
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 = vx_current_xid();
- else
- inode->i_xid = 0;
-
+ inode->i_xid = vx_current_fsxid(sb);
if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) {
err = -ENOSPC;
goto fail_dlim;
if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) {
err = -ENOSPC;
goto fail_dlim;