LU-6977 lod: do_index_try should be called first

[fs/lustre-release.git] / lustre / llite / remote_perm.c

diff --git a/lustre/llite/remote_perm.c b/lustre/llite/remote_perm.c
index 25550b4..99a30e4 100644 (file)
--- a/lustre/llite/remote_perm.c
+++ b/lustre/llite/remote_perm.c
@@ -46,6 +46,10 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/version.h>
+#include <linux/user_namespace.h>
+#ifdef HAVE_UIDGID_HEADER
+# include <linux/uidgid.h>
+#endif
 
 #include <lustre_ha.h>
 #include <lustre_dlm.h>
@@ -253,7 +257,6 @@ int lustre_check_remote_perm(struct inode *inode, int mask)
         struct ll_sb_info *sbi = ll_i2sbi(inode);
         struct ptlrpc_request *req = NULL;
         struct mdt_remote_perm *perm;
-        struct obd_capa *oc;
         cfs_time_t save;
         int i = 0, rc;
         ENTRY;
@@ -281,10 +284,8 @@ int lustre_check_remote_perm(struct inode *inode, int mask)
                         LBUG();
                 }
 
-                oc = ll_mdscapa_get(inode);
-                rc = md_get_remote_perm(sbi->ll_md_exp, ll_inode2fid(inode), oc,
-                                        ll_i2suppgid(inode), &req);
-                capa_put(oc);
+               rc = md_get_remote_perm(sbi->ll_md_exp, ll_inode2fid(inode),
+                                       ll_i2suppgid(inode), &req);
                 if (rc) {
                        mutex_unlock(&lli->lli_rmtperm_mutex);
                         break;