Merge tag 'afs-next-20211102' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowel...

Pull AFS updates from David Howells:

 - Split the readpage handler for symlinks from the one for files. The
   symlink readpage isn't given a file pointer, so the handling has to
   be special-cased.

   This has been posted as part of a patchset to foliate netfs, afs,
   etc.[1] but I've moved it to this one as it's not actually doing
   foliation but is more of a pre-cleanup.

 - Fix file creation to set the mtime from the client's clock to keep
   make happy if the server's clock isn't quite in sync.[2]

Link: https://lore.kernel.org/r/163005742570.2472992.7800423440314043178.stgit@warthog.procyon.org.uk/
Link: http://lists.infradead.org/pipermail/linux-afs/2021-October/004395.html
* tag 'afs-next-20211102' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  afs: Set mtime from the client for yfs create operations
  afs: Sort out symlink reading

diff --git a/fs/afs/file.c b/fs/afs/file.c
index e6c447a..eb11d04 100644 (file)
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -19,6 +19,7 @@
 
 static int afs_file_mmap(struct file *file, struct vm_area_struct *vma);
 static int afs_readpage(struct file *file, struct page *page);
+static int afs_symlink_readpage(struct file *file, struct page *page);
 static void afs_invalidatepage(struct page *page, unsigned int offset,
                               unsigned int length);
 static int afs_releasepage(struct page *page, gfp_t gfp_flags);
@@ -49,7 +50,7 @@ const struct inode_operations afs_file_inode_operations = {
        .permission     = afs_permission,
 };
 
-const struct address_space_operations afs_fs_aops = {
+const struct address_space_operations afs_file_aops = {
        .readpage       = afs_readpage,
        .readahead      = afs_readahead,
        .set_page_dirty = afs_set_page_dirty,
@@ -62,6 +63,12 @@ const struct address_space_operations afs_fs_aops = {
        .writepages     = afs_writepages,
 };
 
+const struct address_space_operations afs_symlink_aops = {
+       .readpage       = afs_symlink_readpage,
+       .releasepage    = afs_releasepage,
+       .invalidatepage = afs_invalidatepage,
+};
+
 static const struct vm_operations_struct afs_vm_ops = {
        .open           = afs_vm_open,
        .close          = afs_vm_close,
@@ -313,7 +320,7 @@ static void afs_req_issue_op(struct netfs_read_subrequest *subreq)
        afs_put_read(fsreq);
 }
 
-static int afs_symlink_readpage(struct page *page)
+static int afs_symlink_readpage(struct file *file, struct page *page)
 {
        struct afs_vnode *vnode = AFS_FS_I(page->mapping->host);
        struct afs_read *fsreq;
@@ -378,9 +385,6 @@ const struct netfs_read_request_ops afs_req_ops = {
 
 static int afs_readpage(struct file *file, struct page *page)
 {
-       if (!file)
-               return afs_symlink_readpage(page);
-
        return netfs_readpage(file, page, &afs_req_ops, NULL);
 }
 

diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index 8fcffea..16906eb 100644 (file)
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -95,7 +95,7 @@ static int afs_inode_init_from_status(struct afs_operation *op,
                inode->i_mode   = S_IFREG | (status->mode & S_IALLUGO);
                inode->i_op     = &afs_file_inode_operations;
                inode->i_fop    = &afs_file_operations;
-               inode->i_mapping->a_ops = &afs_fs_aops;
+               inode->i_mapping->a_ops = &afs_file_aops;
                break;
        case AFS_FTYPE_DIR:
                inode->i_mode   = S_IFDIR |  (status->mode & S_IALLUGO);
@@ -113,11 +113,11 @@ static int afs_inode_init_from_status(struct afs_operation *op,
                        inode->i_mode   = S_IFDIR | 0555;
                        inode->i_op     = &afs_mntpt_inode_operations;
                        inode->i_fop    = &afs_mntpt_file_operations;
-                       inode->i_mapping->a_ops = &afs_fs_aops;
+                       inode->i_mapping->a_ops = &afs_symlink_aops;
                } else {
                        inode->i_mode   = S_IFLNK | status->mode;
                        inode->i_op     = &afs_symlink_inode_operations;
-                       inode->i_mapping->a_ops = &afs_fs_aops;
+                       inode->i_mapping->a_ops = &afs_symlink_aops;
                }
                inode_nohighmem(inode);
                break;

diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index 0ad97a8..9357c53 100644 (file)
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -1055,7 +1055,8 @@ extern void afs_dynroot_depopulate(struct super_block *);
 /*
  * file.c
  */
-extern const struct address_space_operations afs_fs_aops;
+extern const struct address_space_operations afs_file_aops;
+extern const struct address_space_operations afs_symlink_aops;
 extern const struct inode_operations afs_file_inode_operations;
 extern const struct file_operations afs_file_operations;
 extern const struct netfs_read_request_ops afs_req_ops;

diff --git a/fs/afs/yfsclient.c b/fs/afs/yfsclient.c
index 2b35cba..fdc7d67 100644 (file)
--- a/fs/afs/yfsclient.c
+++ b/fs/afs/yfsclient.c
@@ -83,25 +83,18 @@ static s64 linux_to_yfs_time(const struct timespec64 *t)
        return (u64)t->tv_sec * 10000000 + t->tv_nsec/100;
 }
 
-static __be32 *xdr_encode_YFSStoreStatus_mode(__be32 *bp, mode_t mode)
-{
-       struct yfs_xdr_YFSStoreStatus *x = (void *)bp;
-
-       x->mask         = htonl(AFS_SET_MODE);
-       x->mode         = htonl(mode & S_IALLUGO);
-       x->mtime_client = u64_to_xdr(0);
-       x->owner        = u64_to_xdr(0);
-       x->group        = u64_to_xdr(0);
-       return bp + xdr_size(x);
-}
-
-static __be32 *xdr_encode_YFSStoreStatus_mtime(__be32 *bp, const struct timespec64 *t)
+static __be32 *xdr_encode_YFSStoreStatus(__be32 *bp, mode_t *mode,
+                                        const struct timespec64 *t)
 {
        struct yfs_xdr_YFSStoreStatus *x = (void *)bp;
+       mode_t masked_mode = mode ? *mode & S_IALLUGO : 0;
        s64 mtime = linux_to_yfs_time(t);
+       u32 mask = AFS_SET_MTIME;
 
-       x->mask         = htonl(AFS_SET_MTIME);
-       x->mode         = htonl(0);
+       mask |= mode ? AFS_SET_MODE : 0;
+
+       x->mask         = htonl(mask);
+       x->mode         = htonl(masked_mode);
        x->mtime_client = u64_to_xdr(mtime);
        x->owner        = u64_to_xdr(0);
        x->group        = u64_to_xdr(0);
@@ -576,7 +569,7 @@ void yfs_fs_create_file(struct afs_operation *op)
        bp = xdr_encode_u32(bp, 0); /* RPC flags */
        bp = xdr_encode_YFSFid(bp, &dvp->fid);
        bp = xdr_encode_name(bp, name);
-       bp = xdr_encode_YFSStoreStatus_mode(bp, op->create.mode);
+       bp = xdr_encode_YFSStoreStatus(bp, &op->create.mode, &op->mtime);
        bp = xdr_encode_u32(bp, yfs_LockNone); /* ViceLockType */
        yfs_check_req(call, bp);
 
@@ -625,7 +618,7 @@ void yfs_fs_make_dir(struct afs_operation *op)
        bp = xdr_encode_u32(bp, 0); /* RPC flags */
        bp = xdr_encode_YFSFid(bp, &dvp->fid);
        bp = xdr_encode_name(bp, name);
-       bp = xdr_encode_YFSStoreStatus_mode(bp, op->create.mode);
+       bp = xdr_encode_YFSStoreStatus(bp, &op->create.mode, &op->mtime);
        yfs_check_req(call, bp);
 
        trace_afs_make_fs_call1(call, &dvp->fid, name);
@@ -946,6 +939,7 @@ void yfs_fs_symlink(struct afs_operation *op)
        struct afs_vnode_param *dvp = &op->file[0];
        struct afs_call *call;
        size_t contents_sz;
+       mode_t mode = 0777;
        __be32 *bp;
 
        _enter("");
@@ -972,7 +966,7 @@ void yfs_fs_symlink(struct afs_operation *op)
        bp = xdr_encode_YFSFid(bp, &dvp->fid);
        bp = xdr_encode_name(bp, name);
        bp = xdr_encode_string(bp, op->create.symlink, contents_sz);
-       bp = xdr_encode_YFSStoreStatus_mode(bp, S_IRWXUGO);
+       bp = xdr_encode_YFSStoreStatus(bp, &mode, &op->mtime);
        yfs_check_req(call, bp);
 
        trace_afs_make_fs_call1(call, &dvp->fid, name);
@@ -1103,7 +1097,7 @@ void yfs_fs_store_data(struct afs_operation *op)
        bp = xdr_encode_u32(bp, YFSSTOREDATA64);
        bp = xdr_encode_u32(bp, 0); /* RPC flags */
        bp = xdr_encode_YFSFid(bp, &vp->fid);
-       bp = xdr_encode_YFSStoreStatus_mtime(bp, &op->mtime);
+       bp = xdr_encode_YFSStoreStatus(bp, NULL, &op->mtime);
        bp = xdr_encode_u64(bp, op->store.pos);
        bp = xdr_encode_u64(bp, op->store.size);
        bp = xdr_encode_u64(bp, op->store.i_size);