diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-31 12:12:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-31 12:12:49 -0700 |
| commit | a80a66caf8110fc33af8013353fe0da0ae553a13 (patch) | |
| tree | 35cf3ba9ccba371b2e2752cd5cbfc8c3a428f1ea /fs | |
| parent | bf699c9bac124f0a095d8ef06f2d6b219300a822 (diff) | |
| parent | c7ff91d722e44c98504e6e2c357b47e1988dfbbd (diff) | |
| download | blackbird-op-linux-a80a66caf8110fc33af8013353fe0da0ae553a13.tar.gz blackbird-op-linux-a80a66caf8110fc33af8013353fe0da0ae553a13.zip | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_quotaops.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_ialloc.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_quotaops.c b/fs/xfs/linux-2.6/xfs_quotaops.c index 9e41f91aa269..3d4a0c84d634 100644 --- a/fs/xfs/linux-2.6/xfs_quotaops.c +++ b/fs/xfs/linux-2.6/xfs_quotaops.c @@ -80,7 +80,7 @@ xfs_fs_set_xstate( if (sb->s_flags & MS_RDONLY) return -EROFS; - if (!XFS_IS_QUOTA_RUNNING(mp)) + if (op != Q_XQUOTARM && !XFS_IS_QUOTA_RUNNING(mp)) return -ENOSYS; if (!capable(CAP_SYS_ADMIN)) return -EPERM; diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c index ab64f3efb43b..0785797db828 100644 --- a/fs/xfs/xfs_ialloc.c +++ b/fs/xfs/xfs_ialloc.c @@ -880,6 +880,7 @@ nextag: * Not in range - save last search * location and allocate a new inode */ + xfs_btree_del_cursor(tcur, XFS_BTREE_NOERROR); pag->pagl_leftrec = trec.ir_startino; pag->pagl_rightrec = rec.ir_startino; pag->pagl_pagino = pagino; |
