rpms/kernel/F-11 patch-2.6.29.4.bz2.sign, NONE, 1.1 .cvsignore, 1.1043, 1.1044 kernel.spec, 1.1622, 1.1623 linux-2.6-btrfs-unstable-update.patch, 1.1, 1.2 sources, 1.1005, 1.1006 upstream, 1.916, 1.917 linux-2.6-btrfs-fix-page-mkwrite.patch, 1.2, NONE linux-2.6-ftdi-oops.patch, 1.2, NONE linux-2.6-i2c-fix-bit-algorithm-timeout.patch, 1.1, NONE patch-2.6.29.3.bz2.sign, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Mon May 25 20:11:41 UTC 2009
- Previous message: rpms/php-Smarty/devel .cvsignore, 1.7, 1.8 php-Smarty.spec, 1.10, 1.11 sources, 1.7, 1.8 php-Smarty-2.6.20-security.patch, 1.1, NONE
- Next message: rpms/kernel/F-11 keys-Handle-there-being-no-fallback-destination-key.patch, NONE, 1.1 kernel.spec, 1.1623, 1.1624
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kyle
Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28317
Modified Files:
.cvsignore kernel.spec linux-2.6-btrfs-unstable-update.patch
sources upstream
Added Files:
patch-2.6.29.4.bz2.sign
Removed Files:
linux-2.6-btrfs-fix-page-mkwrite.patch
linux-2.6-ftdi-oops.patch
linux-2.6-i2c-fix-bit-algorithm-timeout.patch
patch-2.6.29.3.bz2.sign
Log Message:
* Mon May 25 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.4-161
- Linux 2.6.29.4
- dropped patches:
linux-2.6-i2c-fix-bit-algorithm-timeout.patch
linux-2.6-ftdi-oops.patch
linux-2.6-btrfs-fix-page-mkwrite.patch
- rebased patches:
linux-2.6-btrfs-unstable-update.patch, page_mkwrite fixes.
--- NEW FILE patch-2.6.29.4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBKE5fVyGugalF9Dw4RAoKhAJ470d4u2OJ6Oro8X0+/ZAic0DuOCQCeL+FG
bPBmQ9oxkdl7pn8Yq4Sr0Js=
=d64J
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1043
retrieving revision 1.1044
diff -u -p -r1.1043 -r1.1044
--- .cvsignore 9 May 2009 02:08:22 -0000 1.1043
+++ .cvsignore 25 May 2009 20:11:10 -0000 1.1044
@@ -5,4 +5,4 @@ kernel-2.6.*.config
temp-*
kernel-2.6.29
linux-2.6.29.tar.bz2
-patch-2.6.29.3.bz2
+patch-2.6.29.4.bz2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1622
retrieving revision 1.1623
diff -u -p -r1.1622 -r1.1623
--- kernel.spec 25 May 2009 17:26:52 -0000 1.1622
+++ kernel.spec 25 May 2009 20:11:10 -0000 1.1623
@@ -37,7 +37,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 3
+%define stable_update 4
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -734,19 +734,16 @@ Patch2924: linux-2.6-ext4-clear-unwritte
Patch2925: linux-2.6-ext4-fix-i_cached_extent-race.patch
Patch3000: linux-2.6-btrfs-unstable-update.patch
-Patch3001: linux-2.6-btrfs-fix-page-mkwrite.patch
Patch3010: linux-2.6-relatime-by-default.patch
Patch3020: linux-2.6-fiemap-header-install.patch
Patch4000: linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
-Patch4010: linux-2.6-ftdi-oops.patch
Patch5000: linux-2.6-add-qcserial.patch
# patches headed for -stable
# fix squashfs on systems where pagesize > blocksize (ia64, ppc64 w/64k pages)
Patch6010: squashfs-broken-when-pagesize-greater-than-blocksize.patch
-Patch7005: linux-2.6-i2c-fix-bit-algorithm-timeout.patch
Patch9000: hpet-fixes.patch
@@ -1223,7 +1220,6 @@ ApplyPatch linux-2.6-ext4-fix-i_cached_e
# btrfs
ApplyPatch linux-2.6-btrfs-unstable-update.patch
-ApplyPatch linux-2.6-btrfs-fix-page-mkwrite.patch
# relatime
ApplyPatch linux-2.6-relatime-by-default.patch
@@ -1234,7 +1230,6 @@ ApplyPatch linux-2.6-fiemap-header-insta
# USB
ApplyPatch linux-2.6-add-qcserial.patch
ApplyPatch linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
-ApplyPatch linux-2.6-ftdi-oops.patch
# ACPI
ApplyPatch linux-2.6-defaults-acpi-video.patch
@@ -1404,7 +1399,6 @@ ApplyPatch linux-2.6-revert-dvb-net-kabi
# patches headed for -stable
ApplyPatch squashfs-broken-when-pagesize-greater-than-blocksize.patch
-ApplyPatch linux-2.6-i2c-fix-bit-algorithm-timeout.patch
ApplyPatch hpet-fixes.patch
@@ -2012,6 +2006,15 @@ fi
# and build.
%changelog
+* Mon May 25 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.4-161
+- Linux 2.6.29.4
+- dropped patches:
+ linux-2.6-i2c-fix-bit-algorithm-timeout.patch
+ linux-2.6-ftdi-oops.patch
+ linux-2.6-btrfs-fix-page-mkwrite.patch
+- rebased patches:
+ linux-2.6-btrfs-unstable-update.patch, page_mkwrite fixes.
+
* Mon May 25 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.3-160
- kvm fixes destined for 2.6.30, rhbz#492838:
kvm-Fix-PDPTR-reloading-on-CR4-writes.patch
linux-2.6-btrfs-unstable-update.patch:
Index: linux-2.6-btrfs-unstable-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-btrfs-unstable-update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-btrfs-unstable-update.patch 12 May 2009 13:31:17 -0000 1.1
+++ linux-2.6-btrfs-unstable-update.patch 25 May 2009 20:11:10 -0000 1.2
@@ -32,7 +32,7 @@ index d2cf5a5..9421284 100644
-endif
+ compression.o delayed-ref.o
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
-index 1d53b62..cbba000 100644
+index 1d53b62..754446d 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -60,15 +60,20 @@ static struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
@@ -1742,7 +1742,7 @@ index 37f31b5..a99f1c2 100644
/*
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
-index 5e1d4e3..4414a5d 100644
+index 7dd1b6d..4414a5d 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -45,6 +45,13 @@ struct btrfs_ordered_sum;
@@ -2050,15 +2050,6 @@ index 5e1d4e3..4414a5d 100644
int btrfs_copy_root(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct extent_buffer *buf,
-@@ -2060,7 +2135,7 @@ int btrfs_merge_bio_hook(struct page *page, unsigned long offset,
- unsigned long btrfs_force_ra(struct address_space *mapping,
- struct file_ra_state *ra, struct file *file,
- pgoff_t offset, pgoff_t last_index);
--int btrfs_page_mkwrite(struct vm_area_struct *vma, struct page *page);
-+int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);
- int btrfs_readpage(struct file *file, struct page *page);
- void btrfs_delete_inode(struct inode *inode);
- void btrfs_put_inode(struct inode *inode);
@@ -2102,7 +2177,8 @@ int btrfs_check_file(struct btrfs_root *root, struct inode *inode);
extern struct file_operations btrfs_file_operations;
int btrfs_drop_extents(struct btrfs_trans_handle *trans,
@@ -6356,7 +6347,7 @@ index fefe83a..e496644 100644
ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
if (ret > 0)
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
-index ebe6b29..fe9eb99 100644
+index ebe6b29..eb99602 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -17,12 +17,6 @@
@@ -7987,7 +7978,7 @@ index cc7334d..9abbced 100644
search_key.type = 0;
search_key.offset = 0;
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
-index 7d4f948..90c23eb 100644
+index 17e608c..90c23eb 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -70,7 +70,6 @@ static struct extent_io_ops btrfs_extent_io_ops;
@@ -8453,36 +8444,7 @@ index 7d4f948..90c23eb 100644
btrfs_end_transaction_throttle(trans, root);
fail:
if (drop_inode) {
-@@ -4292,8 +4436,9 @@ static void btrfs_invalidatepage(struct page *page, unsigned long offset)
- * beyond EOF, then the page is guaranteed safe against truncation until we
- * unlock the page.
- */
--int btrfs_page_mkwrite(struct vm_area_struct *vma, struct page *page)
-+int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
- {
-+ struct page *page = vmf->page;
- struct inode *inode = fdentry(vma->vm_file)->d_inode;
- struct btrfs_root *root = BTRFS_I(inode)->root;
- struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
-@@ -4306,10 +4451,15 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct page *page)
- u64 page_end;
-
- ret = btrfs_check_data_free_space(root, inode, PAGE_CACHE_SIZE);
-- if (ret)
-+ if (ret) {
-+ if (ret == -ENOMEM)
-+ ret = VM_FAULT_OOM;
-+ else /* -ENOSPC, -EIO, etc */
-+ ret = VM_FAULT_SIGBUS;
- goto out;
-+ }
-
-- ret = -EINVAL;
-+ ret = VM_FAULT_NOPAGE; /* make the VM retry the fault */
- again:
- lock_page(page);
- size = i_size_read(inode);
-@@ -4357,6 +4507,8 @@ again:
+@@ -4363,6 +4507,8 @@ again:
}
ClearPageChecked(page);
set_page_dirty(page);
@@ -8491,7 +8453,7 @@ index 7d4f948..90c23eb 100644
unlock_extent(io_tree, page_start, page_end, GFP_NOFS);
out_unlock:
-@@ -4382,6 +4534,27 @@ static void btrfs_truncate(struct inode *inode)
+@@ -4388,6 +4534,27 @@ static void btrfs_truncate(struct inode *inode)
btrfs_wait_ordered_range(inode, inode->i_size & (~mask), (u64)-1);
trans = btrfs_start_transaction(root, 1);
@@ -8519,7 +8481,7 @@ index 7d4f948..90c23eb 100644
btrfs_set_trans_block_group(trans, inode);
btrfs_i_size_write(inode, inode->i_size);
-@@ -4458,12 +4631,15 @@ struct inode *btrfs_alloc_inode(struct super_block *sb)
+@@ -4464,12 +4631,15 @@ struct inode *btrfs_alloc_inode(struct super_block *sb)
ei->i_acl = BTRFS_ACL_NOT_CACHED;
ei->i_default_acl = BTRFS_ACL_NOT_CACHED;
INIT_LIST_HEAD(&ei->i_orphan);
@@ -8535,7 +8497,7 @@ index 7d4f948..90c23eb 100644
WARN_ON(!list_empty(&inode->i_dentry));
WARN_ON(inode->i_data.nrpages);
-@@ -4474,13 +4650,24 @@ void btrfs_destroy_inode(struct inode *inode)
+@@ -4480,13 +4650,24 @@ void btrfs_destroy_inode(struct inode *inode)
BTRFS_I(inode)->i_default_acl != BTRFS_ACL_NOT_CACHED)
posix_acl_release(BTRFS_I(inode)->i_default_acl);
@@ -8562,7 +8524,7 @@ index 7d4f948..90c23eb 100644
while (1) {
ordered = btrfs_lookup_first_ordered_extent(inode, (u64)-1);
-@@ -4515,47 +4702,36 @@ void btrfs_destroy_cachep(void)
+@@ -4521,47 +4702,36 @@ void btrfs_destroy_cachep(void)
kmem_cache_destroy(btrfs_trans_handle_cachep);
if (btrfs_transaction_cachep)
kmem_cache_destroy(btrfs_transaction_cachep);
@@ -8626,7 +8588,7 @@ index 7d4f948..90c23eb 100644
return 0;
fail:
btrfs_destroy_cachep();
-@@ -4605,8 +4781,36 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
+@@ -4611,8 +4781,36 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
if (ret)
goto out_unlock;
@@ -8663,7 +8625,7 @@ index 7d4f948..90c23eb 100644
btrfs_set_trans_block_group(trans, new_dir);
btrfs_inc_nlink(old_dentry->d_inode);
-@@ -4614,6 +4818,9 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
+@@ -4620,6 +4818,9 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
new_dir->i_ctime = new_dir->i_mtime = ctime;
old_inode->i_ctime = ctime;
@@ -8673,7 +8635,7 @@ index 7d4f948..90c23eb 100644
ret = btrfs_unlink_inode(trans, root, old_dir, old_dentry->d_inode,
old_dentry->d_name.name,
old_dentry->d_name.len);
-@@ -4645,7 +4852,14 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
+@@ -4651,7 +4852,14 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
if (ret)
goto out_fail;
@@ -8688,7 +8650,7 @@ index 7d4f948..90c23eb 100644
btrfs_end_transaction_throttle(trans, root);
out_unlock:
return ret;
-@@ -4813,10 +5027,10 @@ out_fail:
+@@ -4819,10 +5027,10 @@ out_fail:
return err;
}
@@ -8702,7 +8664,7 @@ index 7d4f948..90c23eb 100644
struct btrfs_root *root = BTRFS_I(inode)->root;
struct btrfs_key ins;
u64 alloc_size;
-@@ -4824,10 +5038,6 @@ static int prealloc_file_range(struct inode *inode, u64 start, u64 end,
+@@ -4830,10 +5038,6 @@ static int prealloc_file_range(struct inode *inode, u64 start, u64 end,
u64 num_bytes = end - start;
int ret = 0;
@@ -8713,7 +8675,7 @@ index 7d4f948..90c23eb 100644
while (num_bytes > 0) {
alloc_size = min(num_bytes, root->fs_info->max_extent);
ret = btrfs_reserve_extent(trans, root, alloc_size,
-@@ -4840,7 +5050,8 @@ static int prealloc_file_range(struct inode *inode, u64 start, u64 end,
+@@ -4846,7 +5050,8 @@ static int prealloc_file_range(struct inode *inode, u64 start, u64 end,
ret = insert_reserved_file_extent(trans, inode,
cur_offset, ins.objectid,
ins.offset, ins.offset,
@@ -8723,7 +8685,7 @@ index 7d4f948..90c23eb 100644
BTRFS_FILE_EXTENT_PREALLOC);
BUG_ON(ret);
num_bytes -= ins.offset;
-@@ -4858,7 +5069,6 @@ out:
+@@ -4864,7 +5069,6 @@ out:
BUG_ON(ret);
}
@@ -8731,7 +8693,7 @@ index 7d4f948..90c23eb 100644
return ret;
}
-@@ -4870,13 +5080,21 @@ static long btrfs_fallocate(struct inode *inode, int mode,
+@@ -4876,13 +5080,21 @@ static long btrfs_fallocate(struct inode *inode, int mode,
u64 alloc_start;
u64 alloc_end;
u64 alloc_hint = 0;
@@ -8753,7 +8715,7 @@ index 7d4f948..90c23eb 100644
mutex_lock(&inode->i_mutex);
if (alloc_start > inode->i_size) {
ret = btrfs_cont_expand(inode, alloc_start);
-@@ -4884,10 +5102,21 @@ static long btrfs_fallocate(struct inode *inode, int mode,
+@@ -4890,10 +5102,21 @@ static long btrfs_fallocate(struct inode *inode, int mode,
goto out;
}
@@ -8777,7 +8739,7 @@ index 7d4f948..90c23eb 100644
ordered = btrfs_lookup_first_ordered_extent(inode,
alloc_end - 1);
if (ordered &&
-@@ -4895,7 +5124,13 @@ static long btrfs_fallocate(struct inode *inode, int mode,
+@@ -4901,7 +5124,13 @@ static long btrfs_fallocate(struct inode *inode, int mode,
ordered->file_offset < alloc_end) {
btrfs_put_ordered_extent(ordered);
unlock_extent(&BTRFS_I(inode)->io_tree,
@@ -8792,7 +8754,7 @@ index 7d4f948..90c23eb 100644
btrfs_wait_ordered_range(inode, alloc_start,
alloc_end - alloc_start);
} else {
-@@ -4913,8 +5148,9 @@ static long btrfs_fallocate(struct inode *inode, int mode,
+@@ -4919,8 +5148,9 @@ static long btrfs_fallocate(struct inode *inode, int mode,
last_byte = min(extent_map_end(em), alloc_end);
last_byte = (last_byte + mask) & ~mask;
if (em->block_start == EXTENT_MAP_HOLE) {
@@ -8804,7 +8766,7 @@ index 7d4f948..90c23eb 100644
if (ret < 0) {
free_extent_map(em);
break;
-@@ -4930,8 +5166,10 @@ static long btrfs_fallocate(struct inode *inode, int mode,
+@@ -4936,8 +5166,10 @@ static long btrfs_fallocate(struct inode *inode, int mode,
break;
}
}
@@ -8817,7 +8779,7 @@ index 7d4f948..90c23eb 100644
mutex_unlock(&inode->i_mutex);
return ret;
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index bca729f..48762aa 100644
+index bca729f..4dd36dc 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -483,11 +483,13 @@ static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1005
retrieving revision 1.1006
diff -u -p -r1.1005 -r1.1006
--- sources 9 May 2009 02:08:25 -0000 1.1005
+++ sources 25 May 2009 20:11:10 -0000 1.1006
@@ -1,2 +1,2 @@
64921b5ff5cdadbccfcd3820f03be7d8 linux-2.6.29.tar.bz2
-4e16a087ca4455f5e95c5890c4ac23f6 patch-2.6.29.3.bz2
+03f1a0236cc37d8594d2f3c837d81c9d patch-2.6.29.4.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.916
retrieving revision 1.917
diff -u -p -r1.916 -r1.917
--- upstream 9 May 2009 02:08:25 -0000 1.916
+++ upstream 25 May 2009 20:11:10 -0000 1.917
@@ -1,2 +1,2 @@
linux-2.6.29.tar.bz2
-patch-2.6.29.3.bz2
+patch-2.6.29.4.bz2
--- linux-2.6-btrfs-fix-page-mkwrite.patch DELETED ---
--- linux-2.6-ftdi-oops.patch DELETED ---
--- linux-2.6-i2c-fix-bit-algorithm-timeout.patch DELETED ---
--- patch-2.6.29.3.bz2.sign DELETED ---
- Previous message: rpms/php-Smarty/devel .cvsignore, 1.7, 1.8 php-Smarty.spec, 1.10, 1.11 sources, 1.7, 1.8 php-Smarty-2.6.20-security.patch, 1.1, NONE
- Next message: rpms/kernel/F-11 keys-Handle-there-being-no-fallback-destination-key.patch, NONE, 1.1 kernel.spec, 1.1623, 1.1624
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list