The patch titled
knfsd: move EX_RDONLY out of header
has been added to the -mm tree. Its filename is
knfsd-move-ex_rdonly-out-of-header.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: knfsd: move EX_RDONLY out of header
From: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
EX_RDONLY is only called in one place; just put it there.
Signed-off-by: "J. Bruce Fields" <bfields@xxxxxxxxxxxxxx>
Cc: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/nfsd/vfs.c | 12 ++++++++++++
include/linux/nfsd/export.h | 12 ------------
2 files changed, 12 insertions(+), 12 deletions(-)
diff -puN fs/nfsd/vfs.c~knfsd-move-ex_rdonly-out-of-header fs/nfsd/vfs.c
--- a/fs/nfsd/vfs.c~knfsd-move-ex_rdonly-out-of-header
+++ a/fs/nfsd/vfs.c
@@ -1797,6 +1797,18 @@ nfsd_statfs(struct svc_rqst *rqstp, stru
return err;
}
+static inline int EX_RDONLY(struct svc_export *exp, struct svc_rqst *rqstp)
+{
+ struct exp_flavor_info *f;
+ struct exp_flavor_info *end = exp->ex_flavors + exp->ex_nflavors;
+
+ for (f = exp->ex_flavors; f < end; f++) {
+ if (f->pseudoflavor == rqstp->rq_flavor)
+ return f->flags & NFSEXP_READONLY;
+ }
+ return exp->ex_flags & NFSEXP_READONLY;
+}
+
/*
* Check for a user's access permissions to this inode.
*/
diff -puN include/linux/nfsd/export.h~knfsd-move-ex_rdonly-out-of-header include/linux/nfsd/export.h
--- a/include/linux/nfsd/export.h~knfsd-move-ex_rdonly-out-of-header
+++ a/include/linux/nfsd/export.h
@@ -116,18 +116,6 @@ struct svc_expkey {
#define EX_NOHIDE(exp) ((exp)->ex_flags & NFSEXP_NOHIDE)
#define EX_WGATHER(exp) ((exp)->ex_flags & NFSEXP_GATHERED_WRITES)
-static inline int EX_RDONLY(struct svc_export *exp, struct svc_rqst *rqstp)
-{
- struct exp_flavor_info *f;
- struct exp_flavor_info *end = exp->ex_flavors + exp->ex_nflavors;
-
- for (f = exp->ex_flavors; f < end; f++) {
- if (f->pseudoflavor == rqstp->rq_flavor)
- return f->flags & NFSEXP_READONLY;
- }
- return exp->ex_flags & NFSEXP_READONLY;
-}
-
__be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp);
/*
_
Patches currently in -mm which might be from bfields@xxxxxxxxxxxxxx are
origin.patch
auth_gss-unregister-gss_domain-when-unloading-module.patch
git-vfs-lease-api.patch
nfsd-fix-possible-read-ahead-cache-and-export-table-corruption.patch
nfsd-return-errors-not-null-from-export-functions.patch
nfsd-remove-unnecessary-null-checks-from-nfsd_cross_mnt.patch
knfsd-move-ex_rdonly-out-of-header.patch
knfsd-clean-up-ex_rdonly.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
