Merge tag 'fuse-update-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszered...

[linux-2.6-microblaze.git] / fs / fuse / fuse_i.h

diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index ca868b7..7e463e2 100644 (file)
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -552,9 +552,12 @@ struct fuse_conn {
        /** Maximum write size */
        unsigned max_write;
 
-       /** Maxmum number of pages that can be used in a single request */
+       /** Maximum number of pages that can be used in a single request */
        unsigned int max_pages;
 
+       /** Constrain ->max_pages to this value during feature negotiation */
+       unsigned int max_pages_limit;
+
        /** Input queue */
        struct fuse_iqueue iq;
 
@@ -668,6 +671,9 @@ struct fuse_conn {
        /** Is setxattr not implemented by fs? */
        unsigned no_setxattr:1;
 
+       /** Does file server support extended setxattr */
+       unsigned setxattr_ext:1;
+
        /** Is getxattr not implemented by fs? */
        unsigned no_getxattr:1;
 
@@ -713,7 +719,7 @@ struct fuse_conn {
        /** Use enhanced/automatic page cache invalidation. */
        unsigned auto_inval_data:1;
 
-       /** Filesystem is fully reponsible for page cache invalidation. */
+       /** Filesystem is fully responsible for page cache invalidation. */
        unsigned explicit_inval_data:1;
 
        /** Does the filesystem support readdirplus? */
@@ -934,6 +940,7 @@ struct fuse_io_args {
                struct {
                        struct fuse_write_in in;
                        struct fuse_write_out out;
+                       bool page_locked;
                } write;
        };
        struct fuse_args_pages ap;
@@ -1193,7 +1200,7 @@ void fuse_unlock_inode(struct inode *inode, bool locked);
 bool fuse_lock_inode(struct inode *inode);
 
 int fuse_setxattr(struct inode *inode, const char *name, const void *value,
-                 size_t size, int flags);
+                 size_t size, int flags, unsigned int extra_flags);
 ssize_t fuse_getxattr(struct inode *inode, const char *name, void *value,
                      size_t size);
 ssize_t fuse_listxattr(struct dentry *entry, char *list, size_t size);