mv643xx_eth: Fix compile error for architectures without clk.

[pandora-kernel.git] / fs / xfs / xfs_iops.c

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 3011b87..1a25fd8 100644 (file)
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -18,9 +18,7 @@
 #include "xfs.h"
 #include "xfs_fs.h"
 #include "xfs_acl.h"
-#include "xfs_bit.h"
 #include "xfs_log.h"
-#include "xfs_inum.h"
 #include "xfs_trans.h"
 #include "xfs_sb.h"
 #include "xfs_ag.h"
@@ -34,7 +32,6 @@
 #include "xfs_rtalloc.h"
 #include "xfs_error.h"
 #include "xfs_itable.h"
-#include "xfs_rw.h"
 #include "xfs_attr.h"
 #include "xfs_buf_item.h"
 #include "xfs_utils.h"
@@ -700,7 +697,7 @@ xfs_setattr_size(
        xfs_off_t               oldsize, newsize;
        struct xfs_trans        *tp;
        int                     error;
-       uint                    lock_flags;
+       uint                    lock_flags = 0;
        uint                    commit_flags = 0;
 
        trace_xfs_setattr(ip);
@@ -720,10 +717,10 @@ xfs_setattr_size(
                        ATTR_MTIME_SET|ATTR_KILL_SUID|ATTR_KILL_SGID|
                        ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0);
 
-       lock_flags = XFS_ILOCK_EXCL;
-       if (!(flags & XFS_ATTR_NOLOCK))
+       if (!(flags & XFS_ATTR_NOLOCK)) {
                lock_flags |= XFS_IOLOCK_EXCL;
-       xfs_ilock(ip, lock_flags);
+               xfs_ilock(ip, lock_flags);
+       }
 
        oldsize = inode->i_size;
        newsize = iattr->ia_size;
@@ -746,7 +743,7 @@ xfs_setattr_size(
        /*
         * Make sure that the dquots are attached to the inode.
         */
-       error = xfs_qm_dqattach_locked(ip, 0);
+       error = xfs_qm_dqattach(ip, 0);
        if (error)
                goto out_unlock;
 
@@ -768,8 +765,6 @@ xfs_setattr_size(
                if (error)
                        goto out_unlock;
        }
-       xfs_iunlock(ip, XFS_ILOCK_EXCL);
-       lock_flags &= ~XFS_ILOCK_EXCL;
 
        /*
         * We are going to log the inode size change in this transaction so