X-Spam-Checker-Version: SpamAssassin 3.3.0-rupdated (updated) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.6 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.3.0-rupdated Received: from oss.sgi.com (localhost [127.0.0.1]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id n9UIfABY241570 for ; Fri, 30 Oct 2009 13:41:10 -0500 Received: (from aelder@localhost) by oss.sgi.com (8.14.3/8.14.3/Submit) id n9UIf9Zx241536; Fri, 30 Oct 2009 13:41:09 -0500 Date: Fri, 30 Oct 2009 13:41:09 -0500 Message-Id: <200910301841.n9UIf9Zx241536@oss.sgi.com> From: xfs@oss.sgi.com To: xfs@oss.sgi.com Subject: [XFS updates] XFS development tree branch, master, updated. v2.6.30-rc4-12980-gfd683ea X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 05277c75f6dea8ecf59138cd1b6781fb54ae08bd X-Git-Newrev: fd683eac8259109c468e643e323c2b6aa989bd1a 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, master has been updated fd683ea xfs: fix xfs_quota remove error 0616d0d xfs: free temporary cursor in xfs_dialloc from 05277c75f6dea8ecf59138cd1b6781fb54ae08bd (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 fd683eac8259109c468e643e323c2b6aa989bd1a Author: Ryota Yamauchi 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 Signed-off-by: Utako Kusaka Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 0616d0d97c6bdb747a28bab557ad70bef2818fcb Author: Eric Sandeen 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 Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder ----------------------------------------------------------------------- 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