lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2009-10-31 12:12:49 -07:00
parent bf699c9bac c7ff91d722
commit a80a66caf8
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/linux-2.6/xfs_quotaops.c
View File

@@ -80,7 +80,7 @@ xfs_fs_set_xstate(
if (sb->s_flags & MS_RDONLY) if (sb->s_flags & MS_RDONLY)
return -EROFS; return -EROFS;
if (!XFS_IS_QUOTA_RUNNING(mp)) if (op != Q_XQUOTARM && !XFS_IS_QUOTA_RUNNING(mp))
return -ENOSYS; return -ENOSYS;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;

1
fs/xfs/xfs_ialloc.c
View File

@@ -880,6 +880,7 @@ nextag:
* Not in range - save last search * Not in range - save last search
* location and allocate a new inode * location and allocate a new inode
*/ */
xfs_btree_del_cursor(tcur, XFS_BTREE_NOERROR);
pag->pagl_leftrec = trec.ir_startino; pag->pagl_leftrec = trec.ir_startino;
pag->pagl_rightrec = rec.ir_startino; pag->pagl_rightrec = rec.ir_startino;
pag->pagl_pagino = pagino; pag->pagl_pagino = pagino;