]> git.baikalelectronics.ru Git - kernel.git/commitdiff
cifs: move definition of cifs_fattr earlier in cifsglob.h
authorRonnie Sahlberg <lsahlber@redhat.com>
Mon, 9 May 2022 23:42:04 +0000 (09:42 +1000)
committerSteve French <stfrench@microsoft.com>
Sat, 21 May 2022 17:22:57 +0000 (12:22 -0500)
This only moves these definitions to come earlier in the file
but not change the definition itself.
This is done to reduce the amount of changes in future patches.

Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Reviewed-by: Enzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/cifs/cifsglob.h

index 91678cd01741aa477755e4129f0a999572d1994c..011c440bbd98a3bc7da0b29987e239b9d8b5d9d8 100644 (file)
@@ -1009,6 +1009,37 @@ cap_unix(struct cifs_ses *ses)
        return ses->server->vals->cap_unix & ses->capabilities;
 }
 
+/*
+ * common struct for holding inode info when searching for or updating an
+ * inode with new info
+ */
+
+#define CIFS_FATTR_DFS_REFERRAL                0x1
+#define CIFS_FATTR_DELETE_PENDING      0x2
+#define CIFS_FATTR_NEED_REVAL          0x4
+#define CIFS_FATTR_INO_COLLISION       0x8
+#define CIFS_FATTR_UNKNOWN_NLINK       0x10
+#define CIFS_FATTR_FAKE_ROOT_INO       0x20
+
+struct cifs_fattr {
+       u32             cf_flags;
+       u32             cf_cifsattrs;
+       u64             cf_uniqueid;
+       u64             cf_eof;
+       u64             cf_bytes;
+       u64             cf_createtime;
+       kuid_t          cf_uid;
+       kgid_t          cf_gid;
+       umode_t         cf_mode;
+       dev_t           cf_rdev;
+       unsigned int    cf_nlink;
+       unsigned int    cf_dtype;
+       struct timespec64 cf_atime;
+       struct timespec64 cf_mtime;
+       struct timespec64 cf_ctime;
+       u32             cf_cifstag;
+};
+
 struct cached_fid {
        bool is_valid:1;        /* Do we have a useable root fid */
        bool file_all_info_is_valid:1;
@@ -1641,37 +1672,6 @@ struct file_list {
        struct cifsFileInfo *cfile;
 };
 
-/*
- * common struct for holding inode info when searching for or updating an
- * inode with new info
- */
-
-#define CIFS_FATTR_DFS_REFERRAL                0x1
-#define CIFS_FATTR_DELETE_PENDING      0x2
-#define CIFS_FATTR_NEED_REVAL          0x4
-#define CIFS_FATTR_INO_COLLISION       0x8
-#define CIFS_FATTR_UNKNOWN_NLINK       0x10
-#define CIFS_FATTR_FAKE_ROOT_INO       0x20
-
-struct cifs_fattr {
-       u32             cf_flags;
-       u32             cf_cifsattrs;
-       u64             cf_uniqueid;
-       u64             cf_eof;
-       u64             cf_bytes;
-       u64             cf_createtime;
-       kuid_t          cf_uid;
-       kgid_t          cf_gid;
-       umode_t         cf_mode;
-       dev_t           cf_rdev;
-       unsigned int    cf_nlink;
-       unsigned int    cf_dtype;
-       struct timespec64 cf_atime;
-       struct timespec64 cf_mtime;
-       struct timespec64 cf_ctime;
-       u32             cf_cifstag;
-};
-
 static inline void free_dfs_info_param(struct dfs_info3_param *param)
 {
        if (param) {