projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[cascardo/linux.git]
/
fs
/
gfs2
/
xattr.c
diff --git
a/fs/gfs2/xattr.c
b/fs/gfs2/xattr.c
index
ecd37f3
..
8c6a6f6
100644
(file)
--- a/
fs/gfs2/xattr.c
+++ b/
fs/gfs2/xattr.c
@@
-723,6
+723,7
@@
static int ea_alloc_skeleton(struct gfs2_inode *ip, struct gfs2_ea_request *er,
unsigned int blks,
ea_skeleton_call_t skeleton_call, void *private)
{
unsigned int blks,
ea_skeleton_call_t skeleton_call, void *private)
{
+ struct gfs2_alloc_parms ap = { .target = blks };
struct buffer_head *dibh;
int error;
struct buffer_head *dibh;
int error;
@@
-734,7
+735,7
@@
static int ea_alloc_skeleton(struct gfs2_inode *ip, struct gfs2_ea_request *er,
if (error)
return error;
if (error)
return error;
- error = gfs2_inplace_reserve(ip,
blks, 0
);
+ error = gfs2_inplace_reserve(ip,
&ap
);
if (error)
goto out_gunlock_q;
if (error)
goto out_gunlock_q;