git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
fs
/
xfs
/
xfs_inode.c
diff --git
a/fs/xfs/xfs_inode.c
b/fs/xfs/xfs_inode.c
index
ab973fe
..
8a821fe
100644
(file)
--- a/
fs/xfs/xfs_inode.c
+++ b/
fs/xfs/xfs_inode.c
@@
-1140,8
+1140,7
@@
xfs_ialloc(
* Call the space management code to pick
* the on-disk inode to be allocated.
*/
* Call the space management code to pick
* the on-disk inode to be allocated.
*/
- ASSERT(pip != NULL);
- error = xfs_dialloc(tp, pip ? pip->i_ino : 0, mode, okalloc,
+ error = xfs_dialloc(tp, pip->i_ino, mode, okalloc,
ialloc_context, call_again, &ino);
if (error != 0) {
return error;
ialloc_context, call_again, &ino);
if (error != 0) {
return error;
@@
-3696,12
+3695,6
@@
xfs_iaccess(
mode_t orgmode = mode;
struct inode *inode = LINVFS_GET_IP(XFS_ITOV(ip));
mode_t orgmode = mode;
struct inode *inode = LINVFS_GET_IP(XFS_ITOV(ip));
- /*
- * Verify that the MAC policy allows the requested access.
- */
- if ((error = _MAC_XFS_IACCESS(ip, mode, cr)))
- return XFS_ERROR(error);
-
if (mode & S_IWUSR) {
umode_t imode = inode->i_mode;
if (mode & S_IWUSR) {
umode_t imode = inode->i_mode;