Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a80a66ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bf699c9b c7ff91d7

fs/xfs/linux-2.6/xfs_quotaops.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/xfs/xfs_ialloc.c

+1 −0
Original line number Diff line number Diff line
@@ -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;