fix up nfs patch, thanks to Stefan Lippers-Hollmann for pointing it out

diff --git a/queue-2.6.25/nfs-ensure-we-zap-only-the-access-and-acl-caches-when-setting-new-acls.patch b/queue-2.6.25/nfs-ensure-we-zap-only-the-access-and-acl-caches-when-setting-new-acls.patch
index 80976278ae722508795113c3c77c760eb654e67c..2fa3b0ea696052bdbf40a948178e900b949b82ab 100644 (file)
--- a/queue-2.6.25/nfs-ensure-we-zap-only-the-access-and-acl-caches-when-setting-new-acls.patch
+++ b/queue-2.6.25/nfs-ensure-we-zap-only-the-access-and-acl-caches-when-setting-new-acls.patch
@@ -17,8 +17,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  fs/nfs/inode.c    |    4 +---
  fs/nfs/internal.h |    1 +
  fs/nfs/nfs3acl.c  |    9 ++++++---
- fs/nfs/nfs4proc.c |    5 ++++-
- 4 files changed, 12 insertions(+), 7 deletions(-)
+ fs/nfs/nfs4proc.c |    6 +++++-
+ 4 files changed, 13 insertions(+), 7 deletions(-)
 
 --- a/fs/nfs/inode.c
 +++ b/fs/nfs/inode.c
@@ -84,7 +84,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        /* pages may have been allocated at the xdr layer. */
 --- a/fs/nfs/nfs4proc.c
 +++ b/fs/nfs/nfs4proc.c
-@@ -2707,6 +2707,8 @@ static ssize_t nfs4_proc_get_acl(struct 
+@@ -52,6 +52,7 @@
+ #include "nfs4_fs.h"
+ #include "delegation.h"
+ #include "iostat.h"
++#include "internal.h"
+ 
+ #define NFSDBG_FACILITY               NFSDBG_PROC
+ 
+@@ -2707,6 +2708,8 @@ static ssize_t nfs4_proc_get_acl(struct 
        ret = nfs_revalidate_inode(server, inode);
        if (ret < 0)
                return ret;
@@ -93,7 +101,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        ret = nfs4_read_cached_acl(inode, buf, buflen);
        if (ret != -ENOENT)
                return ret;
-@@ -2734,7 +2736,8 @@ static int __nfs4_proc_set_acl(struct in
+@@ -2734,7 +2737,8 @@ static int __nfs4_proc_set_acl(struct in
        nfs_inode_return_delegation(inode);
        buf_to_pages(buf, buflen, arg.acl_pages, &arg.acl_pgbase);
        ret = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);