diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-14 21:11:02 +1000 | 
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-14 21:11:02 +1000 | 
| commit | ac7c5353b189e10cf5dd27399f64f7b013abffc6 (patch) | |
| tree | 8222d92b774c256d6ec4399c716d76b3f05ddc4b /fs/xfs/linux-2.6/xfs_ioctl.c | |
| parent | a8f75ea70c58546205fb7673be41455b9da5d9a7 (diff) | |
| parent | 120dd64cacd4fb796bca0acba3665553f1d9ecaa (diff) | |
| download | olio-linux-3.10-ac7c5353b189e10cf5dd27399f64f7b013abffc6.tar.xz olio-linux-3.10-ac7c5353b189e10cf5dd27399f64f7b013abffc6.zip  | |
Merge branch 'linux-2.6'
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_ioctl.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl.c | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c index a9952e490ac..f34bd010eb5 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl.c +++ b/fs/xfs/linux-2.6/xfs_ioctl.c @@ -732,7 +732,7 @@ xfs_ioctl(  		 * Only allow the sys admin to reserve space unless  		 * unwritten extents are enabled.  		 */ -		if (!XFS_SB_VERSION_HASEXTFLGBIT(&mp->m_sb) && +		if (!xfs_sb_version_hasextflgbit(&mp->m_sb) &&  		    !capable(CAP_SYS_ADMIN))  			return -EPERM;  |