You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ma...@apache.org on 2021/08/10 12:28:59 UTC
[incubator-nuttx] branch master updated (c4742c2 -> d7cb456)
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from c4742c2 mtd/smartfs: Fix compilation warning
new 7a60efa fs/nfs: Support 64bit file length
new 580de38 fs/nfs: Return nanosecond from nfs_fstat and nfs_stat callback
new d7cb456 fs/nfs: Support fchstat and chstat callback
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
fs/nfs/nfs_node.h | 6 +-
fs/nfs/nfs_util.c | 13 +--
fs/nfs/nfs_vfsops.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++------
3 files changed, 208 insertions(+), 37 deletions(-)
[incubator-nuttx] 03/03: fs/nfs: Support fchstat and chstat callback
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d7cb4567e67a91301060540ecc4643cb757c949e
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Aug 10 15:35:43 2021 +0800
fs/nfs: Support fchstat and chstat callback
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
fs/nfs/nfs_vfsops.c | 220 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 199 insertions(+), 21 deletions(-)
diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c
index 924cde4..0277e57 100644
--- a/fs/nfs/nfs_vfsops.c
+++ b/fs/nfs/nfs_vfsops.c
@@ -97,6 +97,8 @@
# error "Length of cookie verify in fs_dirent_s is incorrect"
#endif
+#define CH_STAT_SIZE (1 << 7)
+
/****************************************************************************
* Private Data
****************************************************************************/
@@ -115,8 +117,9 @@ static void nfs_semgive(FAR struct nfsmount *nmp);
static int nfs_filecreate(FAR struct nfsmount *nmp,
FAR struct nfsnode *np, FAR const char *relpath,
mode_t mode);
-static int nfs_filetruncate(FAR struct nfsmount *nmp,
- FAR struct nfsnode *np, off_t length);
+static int nfs_filechstat(FAR struct nfsmount *nmp,
+ FAR struct nfsnode *np,
+ FAR const struct stat *buf, int flags);
static int nfs_fileopen(FAR struct nfsmount *nmp,
FAR struct nfsnode *np, FAR const char *relpath,
int oflags, mode_t mode);
@@ -131,6 +134,8 @@ static ssize_t nfs_write(FAR struct file *filep, FAR const char *buffer,
static int nfs_dup(FAR const struct file *oldp, FAR struct file *newp);
static int nfs_fsinfo(FAR struct nfsmount *nmp);
static int nfs_fstat(FAR const struct file *filep, FAR struct stat *buf);
+static int nfs_fchstat(FAR const struct file *filep,
+ FAR const struct stat *buf, int flags);
static int nfs_truncate(FAR struct file *filep, off_t length);
static int nfs_opendir(FAR struct inode *mountpt,
FAR const char *relpath, FAR struct fs_dirent_s *dir);
@@ -157,6 +162,8 @@ static int nfs_rename(FAR struct inode *mountpt,
static mode_t nfs_stat_mode(unsigned int mode, unsigned int type);
static int nfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
FAR struct stat *buf);
+static int nfs_chstat(FAR struct inode *mountpt, FAR const char *relpath,
+ FAR const struct stat *buf, int flags);
/****************************************************************************
* Public Data
@@ -180,7 +187,7 @@ const struct mountpt_operations nfs_operations =
NULL, /* sync */
nfs_dup, /* dup */
nfs_fstat, /* fstat */
- NULL, /* fchstat */
+ nfs_fchstat, /* fchstat */
nfs_truncate, /* truncate */
nfs_opendir, /* opendir */
@@ -197,7 +204,7 @@ const struct mountpt_operations nfs_operations =
nfs_rmdir, /* rmdir */
nfs_rename, /* rename */
nfs_stat, /* stat */
- NULL /* chstat */
+ nfs_chstat /* chstat */
};
/****************************************************************************
@@ -378,24 +385,24 @@ static int nfs_filecreate(FAR struct nfsmount *nmp, FAR struct nfsnode *np,
}
/****************************************************************************
- * Name: nfs_filetruncate
+ * Name: nfs_filechstat
*
* Description:
- * Truncate an open file to length. This is part of the file open logic.
+ * Change the status of an open file. This is part of the file open logic.
*
* Returned Value:
* 0 on success; a negative errno value on failure.
*
****************************************************************************/
-static int nfs_filetruncate(FAR struct nfsmount *nmp,
- FAR struct nfsnode *np, off_t length)
+static int nfs_filechstat(FAR struct nfsmount *nmp, FAR struct nfsnode *np,
+ FAR const struct stat *buf, int flags)
{
FAR uint32_t *ptr;
int reqlen;
int ret;
- finfo("Truncating file\n");
+ finfo("Changing file status\n");
/* Create the SETATTR RPC call arguments */
@@ -413,16 +420,83 @@ static int nfs_filetruncate(FAR struct nfsmount *nmp,
/* Copy the variable-length attributes */
- *ptr++ = nfs_false; /* Don't change mode */
- *ptr++ = nfs_false; /* Don't change uid */
- *ptr++ = nfs_false; /* Don't change gid */
- *ptr++ = nfs_true; /* Use the following size */
- *ptr++ = txdr_unsigned(length >> 32); /* Truncate to the specified length */
- *ptr++ = txdr_unsigned(length);
- *ptr++ = HTONL(NFSV3SATTRTIME_TOSERVER); /* Use the server's time */
- *ptr++ = HTONL(NFSV3SATTRTIME_TOSERVER); /* Use the server's time */
- *ptr++ = nfs_false; /* No guard value */
- reqlen += 9 * sizeof(uint32_t);
+ if (flags & CH_STAT_MODE)
+ {
+ *ptr++ = nfs_true;
+ *ptr++ = txdr_unsigned(buf->st_mode);
+ reqlen += 2 * sizeof(uint32_t);
+ }
+ else
+ {
+ *ptr++ = nfs_false;
+ reqlen += sizeof(uint32_t);
+ }
+
+ if (flags & CH_STAT_UID)
+ {
+ *ptr++ = nfs_true;
+ *ptr++ = txdr_unsigned(buf->st_uid);
+ reqlen += 2 * sizeof(uint32_t);
+ }
+ else
+ {
+ *ptr++ = nfs_false;
+ reqlen += sizeof(uint32_t);
+ }
+
+ if (flags & CH_STAT_GID)
+ {
+ *ptr++ = nfs_true;
+ *ptr++ = txdr_unsigned(buf->st_gid);
+ reqlen += 2 * sizeof(uint32_t);
+ }
+ else
+ {
+ *ptr++ = nfs_false;
+ reqlen += sizeof(uint32_t);
+ }
+
+ if (flags & CH_STAT_SIZE)
+ {
+ *ptr++ = nfs_true;
+ txdr_hyper(buf->st_size, ptr);
+ ptr += 2;
+ reqlen += 3 * sizeof(uint32_t);
+ }
+ else
+ {
+ *ptr++ = nfs_false;
+ reqlen += sizeof(uint32_t);
+ }
+
+ if (flags & CH_STAT_ATIME)
+ {
+ *ptr++ = nfs_true;
+ txdr_nfsv3time(&buf->st_atim, ptr);
+ ptr += 2;
+ reqlen += 3 * sizeof(uint32_t);
+ }
+ else
+ {
+ *ptr++ = nfs_false;
+ reqlen += sizeof(uint32_t);
+ }
+
+ if (flags & CH_STAT_MTIME)
+ {
+ *ptr++ = nfs_true;
+ txdr_nfsv3time(&buf->st_mtim, ptr);
+ ptr += 2;
+ reqlen += 3 * sizeof(uint32_t);
+ }
+ else
+ {
+ *ptr++ = nfs_false;
+ reqlen += sizeof(uint32_t);
+ }
+
+ *ptr++ = nfs_false; /* No guard value */
+ reqlen += sizeof(uint32_t);
/* Perform the SETATTR RPC */
@@ -549,11 +623,14 @@ static int nfs_fileopen(FAR struct nfsmount *nmp, FAR struct nfsnode *np,
if ((oflags & (O_TRUNC | O_WRONLY)) == (O_TRUNC | O_WRONLY))
{
+ struct stat buf;
+
/* Truncate the file to zero length. I think we can do this with
* the SETATTR call by setting the length to zero.
*/
- return nfs_filetruncate(nmp, np, 0);
+ buf.st_size = 0;
+ return nfs_filechstat(nmp, np, &buf, CH_STAT_SIZE);
}
return OK;
@@ -1236,6 +1313,47 @@ static int nfs_fstat(FAR const struct file *filep, FAR struct stat *buf)
}
/****************************************************************************
+ * Name: nfs_fchstat
+ *
+ * Description:
+ * Change information about an open file associated with the file
+ * structure 'filep'.
+ *
+ ****************************************************************************/
+
+static int nfs_fchstat(FAR const struct file *filep,
+ FAR const struct stat *buf, int flags)
+{
+ FAR struct nfsmount *nmp;
+ FAR struct nfsnode *np;
+ int ret;
+
+ finfo("Buf %p\n", buf);
+ DEBUGASSERT(filep != NULL && buf != NULL);
+
+ /* Recover our private data from the struct file instance */
+
+ DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
+ np = (FAR struct nfsnode *)filep->f_priv;
+
+ nmp = (FAR struct nfsmount *)filep->f_inode->i_private;
+ DEBUGASSERT(nmp != NULL);
+
+ ret = nfs_semtake(nmp);
+ if (ret < 0)
+ {
+ return ret;
+ }
+
+ /* Change the file mode, owner, group and time. */
+
+ ret = nfs_filechstat(nmp, np, buf, flags);
+
+ nfs_semgive(nmp);
+ return ret;
+}
+
+/****************************************************************************
* Name: nfs_truncate
*
* Description:
@@ -1263,9 +1381,12 @@ static int nfs_truncate(FAR struct file *filep, off_t length)
ret = nfs_semtake(nmp);
if (ret >= 0)
{
+ struct stat buf;
+
/* Then perform the SETATTR RPC to set the new file size */
- ret = nfs_filetruncate(nmp, np, length);
+ buf.st_size = length;
+ ret = nfs_filechstat(nmp, np, &buf, CH_STAT_SIZE);
nfs_semgive(nmp);
}
@@ -2730,3 +2851,60 @@ errout_with_semaphore:
nfs_semgive(nmp);
return ret;
}
+
+/****************************************************************************
+ * Name: nfs_chstat
+ *
+ * Description:
+ * Change information about the file system object at 'relpath'
+ *
+ * Returned Value:
+ * 0 on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int nfs_chstat(FAR struct inode *mountpt, FAR const char *relpath,
+ FAR const struct stat *buf, int flags)
+{
+ FAR struct nfsmount *nmp;
+ struct file_handle fhandle;
+ struct nfsnode np;
+ int ret;
+
+ /* Sanity checks */
+
+ DEBUGASSERT(mountpt && mountpt->i_private);
+
+ /* Get the mountpoint private data from the inode structure */
+
+ nmp = (FAR struct nfsmount *)mountpt->i_private;
+ DEBUGASSERT(nmp && buf);
+
+ ret = nfs_semtake(nmp);
+ if (ret < 0)
+ {
+ return ret;
+ }
+
+ /* Get the file handle of the requested node */
+
+ ret = nfs_findnode(nmp, relpath, &fhandle, NULL, NULL);
+ if (ret != OK)
+ {
+ ferr("ERROR: nfs_findnode failed: %d\n", ret);
+ goto errout_with_semaphore;
+ }
+
+ /* Initialize the nfs node */
+
+ np.n_fhsize = (uint8_t)fhandle.length;
+ memcpy(&np.n_fhandle, &fhandle.handle, fhandle.length);
+
+ /* Change the file mode, owner, group and time. */
+
+ ret = nfs_filechstat(nmp, &np, buf, flags);
+
+errout_with_semaphore:
+ nfs_semgive(nmp);
+ return ret;
+}
[incubator-nuttx] 01/03: fs/nfs: Support 64bit file length
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 7a60efab35fc682e8e2c8d921842969aff2cdeeb
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Aug 10 14:47:03 2021 +0800
fs/nfs: Support 64bit file length
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
fs/nfs/nfs_vfsops.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c
index ca3868e..e580c5f 100644
--- a/fs/nfs/nfs_vfsops.c
+++ b/fs/nfs/nfs_vfsops.c
@@ -116,7 +116,7 @@ static int nfs_filecreate(FAR struct nfsmount *nmp,
FAR struct nfsnode *np, FAR const char *relpath,
mode_t mode);
static int nfs_filetruncate(FAR struct nfsmount *nmp,
- FAR struct nfsnode *np, uint32_t length);
+ FAR struct nfsnode *np, off_t length);
static int nfs_fileopen(FAR struct nfsmount *nmp,
FAR struct nfsnode *np, FAR const char *relpath,
int oflags, mode_t mode);
@@ -389,7 +389,7 @@ static int nfs_filecreate(FAR struct nfsmount *nmp, FAR struct nfsnode *np,
****************************************************************************/
static int nfs_filetruncate(FAR struct nfsmount *nmp,
- FAR struct nfsnode *np, uint32_t length)
+ FAR struct nfsnode *np, off_t length)
{
FAR uint32_t *ptr;
int reqlen;
@@ -417,8 +417,8 @@ static int nfs_filetruncate(FAR struct nfsmount *nmp,
*ptr++ = nfs_false; /* Don't change uid */
*ptr++ = nfs_false; /* Don't change gid */
*ptr++ = nfs_true; /* Use the following size */
- *ptr++ = 0;
- *ptr++ = txdr_unsigned(length); /* Truncate to the specified length */
+ *ptr++ = txdr_unsigned(length >> 32); /* Truncate to the specified length */
+ *ptr++ = txdr_unsigned(length);
*ptr++ = HTONL(NFSV3SATTRTIME_TOSERVER); /* Use the server's time */
*ptr++ = HTONL(NFSV3SATTRTIME_TOSERVER); /* Use the server's time */
*ptr++ = nfs_false; /* No guard value */
[incubator-nuttx] 02/03: fs/nfs: Return nanosecond from nfs_fstat
and nfs_stat callback
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 580de3883231ac37ae2a537e949f109bd1656cf7
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Aug 10 15:38:51 2021 +0800
fs/nfs: Return nanosecond from nfs_fstat and nfs_stat callback
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
fs/nfs/nfs_node.h | 6 +++---
fs/nfs/nfs_util.c | 13 +++----------
fs/nfs/nfs_vfsops.c | 6 +++---
3 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/fs/nfs/nfs_node.h b/fs/nfs/nfs_node.h
index cedd884..ca6303f 100644
--- a/fs/nfs/nfs_node.h
+++ b/fs/nfs/nfs_node.h
@@ -65,9 +65,9 @@ struct nfsnode
uint8_t n_type; /* File type */
uint8_t n_fhsize; /* Size in bytes of the file handle */
uint16_t n_mode; /* File mode for fstat() */
- time_t n_atime; /* File access time */
- time_t n_mtime; /* File modification time */
- time_t n_ctime; /* File creation time */
+ struct timespec n_atime; /* File access time */
+ struct timespec n_mtime; /* File modification time */
+ struct timespec n_ctime; /* File creation time */
nfsfh_t n_fhandle; /* NFS File Handle */
uint64_t n_size; /* Current size of file */
};
diff --git a/fs/nfs/nfs_util.c b/fs/nfs/nfs_util.c
index d7137f9..9fa01da 100644
--- a/fs/nfs/nfs_util.c
+++ b/fs/nfs/nfs_util.c
@@ -514,8 +514,6 @@ int nfs_finddir(FAR struct nfsmount *nmp, FAR const char *relpath,
void nfs_attrupdate(FAR struct nfsnode *np, FAR struct nfs_fattr *attributes)
{
- struct timespec ts;
-
/* Save a few of the files attribute values in file structure (host
* order).
*/
@@ -524,12 +522,7 @@ void nfs_attrupdate(FAR struct nfsnode *np, FAR struct nfs_fattr *attributes)
np->n_mode = fxdr_unsigned(uint16_t, attributes->fa_mode);
np->n_size = fxdr_hyper(&attributes->fa_size);
- fxdr_nfsv3time(&attributes->fa_atime, &ts);
- np->n_atime = ts.tv_sec;
-
- fxdr_nfsv3time(&attributes->fa_mtime, &ts);
- np->n_mtime = ts.tv_sec;
-
- fxdr_nfsv3time(&attributes->fa_ctime, &ts);
- np->n_ctime = ts.tv_sec;
+ fxdr_nfsv3time(&attributes->fa_atime, &np->n_atime);
+ fxdr_nfsv3time(&attributes->fa_mtime, &np->n_mtime);
+ fxdr_nfsv3time(&attributes->fa_ctime, &np->n_ctime);
}
diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c
index e580c5f..924cde4 100644
--- a/fs/nfs/nfs_vfsops.c
+++ b/fs/nfs/nfs_vfsops.c
@@ -1227,9 +1227,9 @@ static int nfs_fstat(FAR const struct file *filep, FAR struct stat *buf)
/* Extract time values as type time_t in units of seconds. */
- buf->st_atime = np->n_atime;
- buf->st_mtime = np->n_mtime;
- buf->st_ctime = np->n_ctime;
+ buf->st_atim = np->n_atime;
+ buf->st_mtim = np->n_mtime;
+ buf->st_ctim = np->n_ctime;
nfs_semgive(nmp);
return OK;