some problems about permission of subdirectory

Commit Message

Kinglong Mee Feb. 23, 2017, 8:18 a.m. UTC

Cc Bruce, Steven,

On 2/23/2017 11:53, houlinfei wrote:
> hi Kinglong,
> I try again, it's okay. but we want to modify the code, till now we are not familiar with nfs, can you tell us where should we modify?

The logic is set a mark on the exported dir when exporting dir,
nfsd kernel checks the mark when finding export entry.

There are two patches I have a little test,
fs/nfsd/vfs.c is the kernel source, and 
utils/exportfs/exportfs.c is the nfs-utils source.



thanks,
Kinglong Mee
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 26c6fdb..c03566c 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -456,6 +456,7 @@  nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
  * NFS junction information is stored in an extended attribute.
  */
 #define NFSD_JUNCTION_XATTR_NAME	XATTR_TRUSTED_PREFIX "junction.nfs"
+#define NFSD_EXPORTED_XATTR_NAME	NFSD_JUNCTION_XATTR_NAME ".exported"
 
 /**
  * nfsd4_is_junction - Test if an object could be an NFS junction
@@ -471,6 +472,8 @@  int nfsd4_is_junction(struct dentry *dentry)
 
 	if (inode == NULL)
 		return 0;
+	if (vfs_getxattr(dentry, NFSD_EXPORTED_XATTR_NAME, NULL, 0) > 0)
+		return 1;
 	if (inode->i_mode & S_IXUGO)
 		return 0;
 	if (!(inode->i_mode & S_ISVTX))

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 02d5b6d..3c6e36b 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -28,6 +28,7 @@ 
 #include <errno.h>
 #include <limits.h>
 #include <time.h>
+#include <linux/xattr.h>
 
 #define INT_TO_LONG_THRESHOLD_SECS (INT_MAX - (60 * 60 * 24))
 
@@ -556,6 +557,9 @@  validate_export(nfs_export *exp)
 		return;
 
 	}
+
+#define NFSD_EXPORTED_XATTR_NAME  XATTR_TRUSTED_PREFIX "junction.nfs.exported"
+	setxattr(path, NFSD_EXPORTED_XATTR_NAME, "exported", 8, 0);
 }
 
 static _Bool