Land first part of new dcache handling (bug 16654).

[fs/lustre-release.git] / lustre / mdc / mdc_locks.c

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index cd7792e..8ab2f4b 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -111,11 +111,15 @@ int it_open_error(int phase, struct lookup_intent *it)
 EXPORT_SYMBOL(it_open_error);
 
 /* this must be called on a lockh that is known to have a referenced lock */
 EXPORT_SYMBOL(it_open_error);
 
 /* this must be called on a lockh that is known to have a referenced lock */

-int mdc_set_lock_data(struct obd_export *exp, __u64 *lockh, void *data)
+int mdc_set_lock_data(struct obd_export *exp, __u64 *lockh, void *data,
+                      __u32 *bits)

 {
         struct ldlm_lock *lock;
         ENTRY;
 
 {
         struct ldlm_lock *lock;
         ENTRY;
 

+        if(bits)
+                *bits = 0;
+

         if (!*lockh) {
                 EXIT;
                 RETURN(0);
         if (!*lockh) {
                 EXIT;
                 RETURN(0);


@@ -138,6 +142,9 @@ int mdc_set_lock_data(struct obd_export *exp, __u64 *lockh, void *data)
         }
 #endif
         lock->l_ast_data = data;
         }
 #endif
         lock->l_ast_data = data;

+        if (bits)
+                *bits = lock->l_policy_data.l_inodebits.bits;
+

         unlock_res_and_lock(lock);
         LDLM_LOCK_PUT(lock);
 
         unlock_res_and_lock(lock);
         LDLM_LOCK_PUT(lock);