git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
l2tp: don't use inet_shutdown on ppp session destroy
[pandora-kernel.git]
/
fs
/
ubifs
/
journal.c
diff --git
a/fs/ubifs/journal.c
b/fs/ubifs/journal.c
index
cef0460
..
562e84d
100644
(file)
--- a/
fs/ubifs/journal.c
+++ b/
fs/ubifs/journal.c
@@
-573,7
+573,7
@@
int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir,
aligned_dlen = ALIGN(dlen, 8);
aligned_ilen = ALIGN(ilen, 8);
len = aligned_dlen + aligned_ilen + UBIFS_INO_NODE_SZ;
aligned_dlen = ALIGN(dlen, 8);
aligned_ilen = ALIGN(ilen, 8);
len = aligned_dlen + aligned_ilen + UBIFS_INO_NODE_SZ;
- dent = k
m
alloc(len, GFP_NOFS);
+ dent = k
z
alloc(len, GFP_NOFS);
if (!dent)
return -ENOMEM;
if (!dent)
return -ENOMEM;
@@
-959,7
+959,7
@@
int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir,
len = aligned_dlen1 + aligned_dlen2 + ALIGN(ilen, 8) + ALIGN(plen, 8);
if (old_dir != new_dir)
len += plen;
len = aligned_dlen1 + aligned_dlen2 + ALIGN(ilen, 8) + ALIGN(plen, 8);
if (old_dir != new_dir)
len += plen;
- dent = k
m
alloc(len, GFP_NOFS);
+ dent = k
z
alloc(len, GFP_NOFS);
if (!dent)
return -ENOMEM;
if (!dent)
return -ENOMEM;
@@
-1307,7
+1307,7
@@
int ubifs_jnl_delete_xattr(struct ubifs_info *c, const struct inode *host,
hlen = host_ui->data_len + UBIFS_INO_NODE_SZ;
len = aligned_xlen + UBIFS_INO_NODE_SZ + ALIGN(hlen, 8);
hlen = host_ui->data_len + UBIFS_INO_NODE_SZ;
len = aligned_xlen + UBIFS_INO_NODE_SZ + ALIGN(hlen, 8);
- xent = k
m
alloc(len, GFP_NOFS);
+ xent = k
z
alloc(len, GFP_NOFS);
if (!xent)
return -ENOMEM;
if (!xent)
return -ENOMEM;
@@
-1414,7
+1414,7
@@
int ubifs_jnl_change_xattr(struct ubifs_info *c, const struct inode *inode,
aligned_len1 = ALIGN(len1, 8);
aligned_len = aligned_len1 + ALIGN(len2, 8);
aligned_len1 = ALIGN(len1, 8);
aligned_len = aligned_len1 + ALIGN(len2, 8);
- ino = k
m
alloc(aligned_len, GFP_NOFS);
+ ino = k
z
alloc(aligned_len, GFP_NOFS);
if (!ino)
return -ENOMEM;
if (!ino)
return -ENOMEM;