This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "XFS development tree".
The branch, for-linus has been updated
a80a66c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs
c7ff91d xfs: fix xfs_quota remove error
3b82638 xfs: free temporary cursor in xfs_dialloc
ba313e6 Merge branch 'master' of ssh://oss.sgi.com/oss/git/xfs/xfs into
for-linus
from 2e2ec952350f25242f2e0539db16b1e46f9eb01b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a80a66caf8110fc33af8013353fe0da0ae553a13
Merge: bf699c9bac124f0a095d8ef06f2d6b219300a822
c7ff91d722e44c98504e6e2c357b47e1988dfbbd
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sat Oct 31 12:12:49 2009 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs
* 'for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs:
xfs: fix xfs_quota remove error
xfs: free temporary cursor in xfs_dialloc
commit c7ff91d722e44c98504e6e2c357b47e1988dfbbd
Author: Ryota Yamauchi <r-yamauchi@xxxxxxxxxxxxx>
Date: Fri Oct 30 09:27:44 2009 +0100
xfs: fix xfs_quota remove error
The xfs_quota returns ENOSYS when remove command is executed.
Reproducable with following steps.
# mount -t xfs -o uquota /dev/sda7 /mnt/mp1
# xfs_quota -x -c off -c remove
XFS_QUOTARM: Function not implemented.
The remove command is allowed during quotaoff, but xfs_fs_set_xstate()
checks whether quota is running, and it leads to ENOSYS.
To solve this problem, add a check for X_QUOTARM.
Signed-off-by: Ryota Yamauchi <r-yamauchi@xxxxxxxxxxxxx>
Signed-off-by: Utako Kusaka <u-kusaka@xxxxxxxxxxxxx>
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
commit 3b826386d376e5545d2e92b2da5ebd965cafae97
Author: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Fri Oct 30 09:27:07 2009 +0100
xfs: free temporary cursor in xfs_dialloc
Commit bd169565993b39b9b4b102cdac8b13e0a259ce2f seems
to have a slight regression where this code path:
if (!--searchdistance) {
/*
* Not in range - save last search
* location and allocate a new inode
*/
...
goto newino;
}
doesn't free the temporary cursor (tcur) that got dup'd in
this function.
This leaks an item in the xfs_btree_cur zone, and it's caught
on module unload:
===========================================================
BUG xfs_btree_cur: Objects remaining on kmem_cache_close()
-----------------------------------------------------------
It seems like maybe a single free at the end of the function might
be cleaner, but for now put a del_cursor right in this code block
similar to the handling in the rest of the function.
Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
commit ba313e68facf190317d8db3afdc0f0028c963a96
Merge: e09d39968bd8befa087f10f970fa236e8694b643
05277c75f6dea8ecf59138cd1b6781fb54ae08bd
Author: Alex Elder <aelder@xxxxxxx>
Date: Tue Oct 13 15:47:22 2009 -0500
Merge branch 'master' of ssh://oss.sgi.com/oss/git/xfs/xfs into for-linus
-----------------------------------------------------------------------
Summary of changes:
fs/xfs/linux-2.6/xfs_quotaops.c | 2 +-
fs/xfs/xfs_ialloc.c | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
XFS development tree
|