1 files changed, 13 insertions, 14 deletions

diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 8831d9518790..865eb708aa95 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -896,7 +896,8 @@ xfs_fs_write_inode(
         struct inode            *inode,
         int                     sync)
 {
-        int                     error = 0, flags = FLUSH_INODE;
+        int                     error = 0;
+        int                     flags = 0;
 
         xfs_itrace_entry(XFS_I(inode));
         if (sync) {
@@ -934,7 +935,7 @@ xfs_fs_clear_inode(
                 xfs_inactive(ip);
                 xfs_iflags_clear(ip, XFS_IMODIFIED);
                 if (xfs_reclaim(ip))
-                        panic("%s: cannot reclaim 0x%p\n", __FUNCTION__, inode);
+                        panic("%s: cannot reclaim 0x%p\n", __func__, inode);
         }
 
         ASSERT(XFS_I(inode) == NULL);
@@ -1027,8 +1028,7 @@ xfs_sync_worker(
         int             error;
 
         if (!(mp->m_flags & XFS_MOUNT_RDONLY))
-                error = xfs_sync(mp, SYNC_FSDATA | SYNC_BDFLUSH | SYNC_ATTR |
-                                     SYNC_REFCACHE | SYNC_SUPER);
+                error = xfs_sync(mp, SYNC_FSDATA | SYNC_BDFLUSH | SYNC_ATTR);
         mp->m_sync_seq++;
         wake_up(&mp->m_wait_single_sync_task);
 }
@@ -1306,7 +1306,7 @@ xfs_fs_fill_super(
         void                    *data,
         int                     silent)
 {
-        struct inode            *rootvp;
+        struct inode            *root;
         struct xfs_mount        *mp = NULL;
         struct xfs_mount_args   *args = xfs_args_allocate(sb, silent);
         int                     error;
@@ -1344,19 +1344,18 @@ xfs_fs_fill_super(
         sb->s_time_gran = 1;
         set_posix_acl_flag(sb);
 
-        rootvp = igrab(mp->m_rootip->i_vnode);
-        if (!rootvp) {
+        root = igrab(mp->m_rootip->i_vnode);
+        if (!root) {
                 error = ENOENT;
                 goto fail_unmount;
         }
-
-        sb->s_root = d_alloc_root(vn_to_inode(rootvp));
-        if (!sb->s_root) {
-                error = ENOMEM;
+        if (is_bad_inode(root)) {
+                error = EINVAL;
                 goto fail_vnrele;
         }
-        if (is_bad_inode(sb->s_root->d_inode)) {
-                error = EINVAL;
+        sb->s_root = d_alloc_root(root);
+        if (!sb->s_root) {
+                error = ENOMEM;
                 goto fail_vnrele;
         }
 
@@ -1378,7 +1377,7 @@ fail_vnrele:
                 dput(sb->s_root);
                 sb->s_root = NULL;
         } else {
-                VN_RELE(rootvp);
+                iput(root);
         }
 
 fail_unmount: