Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[karo-tx-linux.git] / fs / afs / afs.h

diff --git a/fs/afs/afs.h b/fs/afs/afs.h
index c548aa346f0dd6f9a7aed6664abb32bcbb6ddd79..3c462ff6db639a22ce6393ab65c2f84f1d1fe038 100644 (file)
--- a/fs/afs/afs.h
+++ b/fs/afs/afs.h
@@ -119,8 +119,8 @@ struct afs_file_status {
        u64                     size;           /* file size */
        afs_dataversion_t       data_version;   /* current data version */
        u32                     author;         /* author ID */
-       u32                     owner;          /* owner ID */
-       u32                     group;          /* group ID */
+       kuid_t                  owner;          /* owner ID */
+       kgid_t                  group;          /* group ID */
        afs_access_t            caller_access;  /* access rights for authenticated caller */
        afs_access_t            anon_access;    /* access rights for unauthenticated caller */
        umode_t                 mode;           /* UNIX mode */
@@ -133,13 +133,6 @@ struct afs_file_status {
 /*
  * AFS file status change request
  */
-struct afs_store_status {
-       u32                     mask;           /* which bits of the struct are set */
-       u32                     mtime_client;   /* last time client changed data */
-       u32                     owner;          /* owner ID */
-       u32                     group;          /* group ID */
-       umode_t                 mode;           /* UNIX mode */
-};
 
 #define AFS_SET_MTIME          0x01            /* set the mtime */
 #define AFS_SET_OWNER          0x02            /* set the owner ID */