From: Greg Kroah-Hartman Date: Thu, 22 Jan 2009 22:08:16 +0000 (-0800) Subject: remove nfs patch as it needs to wait X-Git-Tag: v2.6.27.13~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f27889cc604ff9fefe2de952389b97aefc86dee1;p=thirdparty%2Fkernel%2Fstable-queue.git remove nfs patch as it needs to wait --- diff --git a/queue-2.6.27/nfsd-ensure-nfsv4-calls-the-underlying-filesystem-on-lockt.patch b/queue-2.6.27/nfsd-ensure-nfsv4-calls-the-underlying-filesystem-on-lockt.patch deleted file mode 100644 index 641a2e366a7..00000000000 --- a/queue-2.6.27/nfsd-ensure-nfsv4-calls-the-underlying-filesystem-on-lockt.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 55ef1274dddd4de387c54d110e354ffbb6cdc706 Mon Sep 17 00:00:00 2001 -From: J. Bruce Fields -Date: Sat, 20 Dec 2008 11:58:38 -0800 -Subject: nfsd: Ensure nfsv4 calls the underlying filesystem on LOCKT - -From: J. Bruce Fields - -commit 55ef1274dddd4de387c54d110e354ffbb6cdc706 upstream. - -Since nfsv4 allows LOCKT without an open, but the ->lock() method is a -file method, we fake up a struct file in the nfsv4 code with just the -fields we need initialized. But we forgot to initialize the file -operations, with the result that LOCKT never results in a call to the -filesystem's ->lock() method (if it exists). - -We could just add that one more initialization. But this hack of faking -up a struct file with only some fields initialized seems the kind of -thing that might cause more problems in the future. We should either do -an open and get a real struct file, or make lock-testing an inode (not a -file) method. - -This patch does the former. - -Reported-by: Marc Eshel -Tested-by: Marc Eshel -Signed-off-by: J. Bruce Fields - ---- - fs/nfsd/nfs4state.c | 30 ++++++++++++++++++++---------- - 1 file changed, 20 insertions(+), 10 deletions(-) - ---- a/fs/nfsd/nfs4state.c -+++ b/fs/nfsd/nfs4state.c -@@ -2767,6 +2767,25 @@ out: - } - - /* -+ * The NFSv4 spec allows a client to do a LOCKT without holding an OPEN, -+ * so we do a temporary open here just to get an open file to pass to -+ * vfs_test_lock. (Arguably perhaps test_lock should be done with an -+ * inode operation.) -+ */ -+static int nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file_lock *lock) -+{ -+ struct file *file; -+ int err; -+ -+ err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file); -+ if (err) -+ return err; -+ err = vfs_test_lock(file, lock); -+ nfsd_close(file); -+ return err; -+} -+ -+/* - * LOCKT operation - */ - __be32 -@@ -2774,7 +2793,6 @@ nfsd4_lockt(struct svc_rqst *rqstp, stru - struct nfsd4_lockt *lockt) - { - struct inode *inode; -- struct file file; - struct file_lock file_lock; - int error; - __be32 status; -@@ -2832,16 +2850,8 @@ nfsd4_lockt(struct svc_rqst *rqstp, stru - - nfs4_transform_lock_offset(&file_lock); - -- /* vfs_test_lock uses the struct file _only_ to resolve the inode. -- * since LOCKT doesn't require an OPEN, and therefore a struct -- * file may not exist, pass vfs_test_lock a struct file with -- * only the dentry:inode set. -- */ -- memset(&file, 0, sizeof (struct file)); -- file.f_path.dentry = cstate->current_fh.fh_dentry; -- - status = nfs_ok; -- error = vfs_test_lock(&file, &file_lock); -+ error = nfsd_test_lock(rqstp, &cstate->current_fh, &file_lock); - if (error) { - status = nfserrno(error); - goto out; diff --git a/queue-2.6.27/series b/queue-2.6.27/series index ef253942853..de2ea4fc457 100644 --- a/queue-2.6.27/series +++ b/queue-2.6.27/series @@ -14,9 +14,9 @@ drivers-net-irda-irda-usb.c-fix-buffer-overflow.patch ia64-turn-on-config_have_unstable_clock.patch kill-sig-1-must-only-apply-to-caller-s-namespace.patch lib-idr.c-use-kmem_cache_zalloc-for-the-idr_layer-cache.patch -nfsd-ensure-nfsv4-calls-the-underlying-filesystem-on-lockt.patch p54usb-add-usb-id-for-thomson-speedtouch-121g.patch pci-keep-aspm-link-state-consistent-throughout-pcie-hierarchy.patch rt2x00-add-usb-id-for-the-linksys-wusb200.patch security-introduce-missing-kfree.patch sgi-xp-eliminate-false-detection-of-no-heartbeat.patch +clocksource-introduce-clocksource_forward_now.patch diff --git a/queue-2.6.28/nfsd-ensure-nfsv4-calls-the-underlying-filesystem-on-lockt.patch b/queue-2.6.28/nfsd-ensure-nfsv4-calls-the-underlying-filesystem-on-lockt.patch deleted file mode 100644 index cec5b35f1da..00000000000 --- a/queue-2.6.28/nfsd-ensure-nfsv4-calls-the-underlying-filesystem-on-lockt.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 55ef1274dddd4de387c54d110e354ffbb6cdc706 Mon Sep 17 00:00:00 2001 -From: J. Bruce Fields -Date: Sat, 20 Dec 2008 11:58:38 -0800 -Subject: nfsd: Ensure nfsv4 calls the underlying filesystem on LOCKT - -From: J. Bruce Fields - -commit 55ef1274dddd4de387c54d110e354ffbb6cdc706 upstream. - -Since nfsv4 allows LOCKT without an open, but the ->lock() method is a -file method, we fake up a struct file in the nfsv4 code with just the -fields we need initialized. But we forgot to initialize the file -operations, with the result that LOCKT never results in a call to the -filesystem's ->lock() method (if it exists). - -We could just add that one more initialization. But this hack of faking -up a struct file with only some fields initialized seems the kind of -thing that might cause more problems in the future. We should either do -an open and get a real struct file, or make lock-testing an inode (not a -file) method. - -This patch does the former. - -Reported-by: Marc Eshel -Tested-by: Marc Eshel -Signed-off-by: J. Bruce Fields - ---- - fs/nfsd/nfs4state.c | 30 ++++++++++++++++++++---------- - 1 file changed, 20 insertions(+), 10 deletions(-) - ---- a/fs/nfsd/nfs4state.c -+++ b/fs/nfsd/nfs4state.c -@@ -2769,6 +2769,25 @@ out: - } - - /* -+ * The NFSv4 spec allows a client to do a LOCKT without holding an OPEN, -+ * so we do a temporary open here just to get an open file to pass to -+ * vfs_test_lock. (Arguably perhaps test_lock should be done with an -+ * inode operation.) -+ */ -+static int nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file_lock *lock) -+{ -+ struct file *file; -+ int err; -+ -+ err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file); -+ if (err) -+ return err; -+ err = vfs_test_lock(file, lock); -+ nfsd_close(file); -+ return err; -+} -+ -+/* - * LOCKT operation - */ - __be32 -@@ -2776,7 +2795,6 @@ nfsd4_lockt(struct svc_rqst *rqstp, stru - struct nfsd4_lockt *lockt) - { - struct inode *inode; -- struct file file; - struct file_lock file_lock; - int error; - __be32 status; -@@ -2834,16 +2852,8 @@ nfsd4_lockt(struct svc_rqst *rqstp, stru - - nfs4_transform_lock_offset(&file_lock); - -- /* vfs_test_lock uses the struct file _only_ to resolve the inode. -- * since LOCKT doesn't require an OPEN, and therefore a struct -- * file may not exist, pass vfs_test_lock a struct file with -- * only the dentry:inode set. -- */ -- memset(&file, 0, sizeof (struct file)); -- file.f_path.dentry = cstate->current_fh.fh_dentry; -- - status = nfs_ok; -- error = vfs_test_lock(&file, &file_lock); -+ error = nfsd_test_lock(rqstp, &cstate->current_fh, &file_lock); - if (error) { - status = nfserrno(error); - goto out; diff --git a/queue-2.6.28/series b/queue-2.6.28/series index c108c4f094c..719a239e6e4 100644 --- a/queue-2.6.28/series +++ b/queue-2.6.28/series @@ -1,4 +1,3 @@ -nfsd-ensure-nfsv4-calls-the-underlying-filesystem-on-lockt.patch pci-keep-aspm-link-state-consistent-throughout-pcie-hierarchy.patch security-introduce-missing-kfree.patch rt2x00-add-usb-id-for-the-linksys-wusb200.patch