diff --git a/[refs] b/[refs]
index c9c4676a00aa..f3e41e0e7775 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e599b3253c5e49f7a2a579eef2fc2aa066989ef5
+refs/heads/master: 834ab12228fad777a11007a24cb6286b02c9a41c
diff --git a/trunk/fs/xfs/xfs_file.c b/trunk/fs/xfs/xfs_file.c
index 56afcdb2377d..92ba18f841f1 100644
--- a/trunk/fs/xfs/xfs_file.c
+++ b/trunk/fs/xfs/xfs_file.c
@@ -962,8 +962,7 @@ xfs_vm_page_mkwrite(
 STATIC loff_t
 xfs_seek_data(
 	struct file		*file,
-	loff_t			start,
-	u32			type)
+	loff_t			start)
 {
 	struct inode		*inode = file->f_mapping->host;
 	struct xfs_inode	*ip = XFS_I(inode);
@@ -1029,8 +1028,7 @@ xfs_seek_data(
 STATIC loff_t
 xfs_seek_hole(
 	struct file		*file,
-	loff_t			start,
-	u32			type)
+	loff_t			start)
 {
 	struct inode		*inode = file->f_mapping->host;
 	struct xfs_inode	*ip = XFS_I(inode);
@@ -1092,9 +1090,9 @@ xfs_file_llseek(
 	case SEEK_SET:
 		return generic_file_llseek(file, offset, origin);
 	case SEEK_DATA:
-		return xfs_seek_data(file, offset, origin);
+		return xfs_seek_data(file, offset);
 	case SEEK_HOLE:
-		return xfs_seek_hole(file, offset, origin);
+		return xfs_seek_hole(file, offset);
 	default:
 		return -EINVAL;
 	}