Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[firefly-linux-kernel-4.4.55.git] / fs / xfs / xfs_rw.c

diff --git a/fs/xfs/xfs_rw.c b/fs/xfs/xfs_rw.c
index defb2febaaf5c68d5cb3663cbb764150fecff0e2..905d1c008be73056458534b58636de0c1247946a 100644 (file)
--- a/fs/xfs/xfs_rw.c
+++ b/fs/xfs/xfs_rw.c
@@ -42,7 +42,6 @@
 #include "xfs_attr.h"
 #include "xfs_bmap.h"
 #include "xfs_acl.h"
-#include "xfs_mac.h"
 #include "xfs_error.h"
 #include "xfs_buf_item.h"
 #include "xfs_rw.h"
@@ -84,7 +83,7 @@ xfs_write_clear_setuid(
        }
        xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
        xfs_trans_set_sync(tp);
-       error = xfs_trans_commit(tp, 0, NULL);
+       error = xfs_trans_commit(tp, 0);
        xfs_iunlock(ip, XFS_ILOCK_EXCL);
        return 0;
 }
@@ -165,7 +164,7 @@ xfs_write_sync_logforce(
                        xfs_trans_ihold(tp, ip);
                        xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
                        xfs_trans_set_sync(tp);
-                       error = xfs_trans_commit(tp, 0, NULL);
+                       error = xfs_trans_commit(tp, 0);
                        xfs_iunlock(ip, XFS_ILOCK_EXCL);
                }
        }