diff options
author | Linus Torvalds | 2015-04-15 01:09:18 +0200 |
---|---|---|
committer | Linus Torvalds | 2015-04-15 01:09:18 +0200 |
commit | 80dcc31fbe55932ac9204daee5f2ebc0c49b6da3 (patch) | |
tree | 723802ccd7e96da883352704fe3d2c5e3ba9d2e6 /fs/gfs2/xattr.c | |
parent | Merge tag 'jfs-4.1' of git://github.com/kleikamp/linux-shaggy (diff) | |
parent | gfs2: fix quota refresh race in do_glock() (diff) | |
download | kernel-qcow2-linux-80dcc31fbe55932ac9204daee5f2ebc0c49b6da3.tar.gz kernel-qcow2-linux-80dcc31fbe55932ac9204daee5f2ebc0c49b6da3.tar.xz kernel-qcow2-linux-80dcc31fbe55932ac9204daee5f2ebc0c49b6da3.zip |
Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
Pull GFS2 updates from Bob Peterson:
"Here is a list of patches we've accumulated for GFS2 for the current
upstream merge window.
Most of the patches fix GFS2 quotas, which were not properly enforced.
There's another that adds me as a GFS2 co-maintainer, and a couple
patches that fix a kernel panic doing splice_write on GFS2 as well as
a few correctness patches"
* tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
gfs2: fix quota refresh race in do_glock()
gfs2: incorrect check for debugfs returns
gfs2: allow fallocate to max out quotas/fs efficiently
gfs2: allow quota_check and inplace_reserve to return available blocks
gfs2: perform quota checks against allocation parameters
GFS2: Move gfs2_file_splice_write outside of #ifdef
GFS2: Allocate reservation during splice_write
GFS2: gfs2_set_acl(): Cache "no acl" as well
Add myself (Bob Peterson) as a maintainer of GFS2
Diffstat (limited to 'fs/gfs2/xattr.c')
-rw-r--r-- | fs/gfs2/xattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c index 0b81f783f787..fd260ce8869a 100644 --- a/fs/gfs2/xattr.c +++ b/fs/gfs2/xattr.c @@ -732,7 +732,7 @@ static int ea_alloc_skeleton(struct gfs2_inode *ip, struct gfs2_ea_request *er, if (error) return error; - error = gfs2_quota_lock_check(ip); + error = gfs2_quota_lock_check(ip, &ap); if (error) return error; |