Merge to Fedora kernel-2.6.7-1.492

[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..0a73218 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -869,6 +869,10 @@ xfs_dic2xflags(
                flags |= XFS_XFLAG_PREALLOC;
        if (di_flags & XFS_DIFLAG_IMMUTABLE)
                flags |= XFS_XFLAG_IMMUTABLE;
+       if (di_flags & XFS_DIFLAG_IUNLINK)
+               flags |= XFS_XFLAG_IUNLINK;
+       if (di_flags & XFS_DIFLAG_BARRIER)
+               flags |= XFS_XFLAG_BARRIER;
        if (di_flags & XFS_DIFLAG_APPEND)
                flags |= XFS_XFLAG_APPEND;
        if (di_flags & XFS_DIFLAG_SYNC)
@@ -1140,8 +1144,7 @@ xfs_ialloc(
         * 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;
@@ -3696,12 +3699,6 @@ xfs_iaccess(
        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;