Whamcloud - gitweb
LU-6512 llite:ll_dir_ioctl cleanup of redundant comparisons
[fs/lustre-release.git] / lustre / llite / glimpse.c
index 5966d58..f0751e7 100644 (file)
@@ -61,7 +61,7 @@ static const struct cl_lock_descr whole_file = {
 };
 
 /*
- * Check whether file has possible unwriten pages.
+ * Check whether file has possible unwritten pages.
  *
  * \retval 1    file is mmap-ed or has dirty pages
  *         0    otherwise
@@ -85,73 +85,67 @@ blkcnt_t dirty_cnt(struct inode *inode)
 int cl_glimpse_lock(const struct lu_env *env, struct cl_io *io,
                    struct inode *inode, struct cl_object *clob, int agl)
 {
-       struct ll_inode_info *lli   = ll_i2info(inode);
-        const struct lu_fid  *fid   = lu_object_fid(&clob->co_lu);
-        int result;
+       const struct lu_fid *fid = lu_object_fid(&clob->co_lu);
+       struct cl_lock *lock = vvp_env_lock(env);
+       struct cl_lock_descr *descr = &lock->cll_descr;
+       int result;
 
-        ENTRY;
-        result = 0;
+       ENTRY;
+       result = 0;
 
        CDEBUG(D_DLMTRACE, "Glimpsing inode "DFID"\n", PFID(fid));
-       if (lli->lli_has_smd) {
-               struct cl_lock *lock = vvp_env_lock(env);
-               struct cl_lock_descr *descr = &lock->cll_descr;
-
-               /* NOTE: this looks like DLM lock request, but it may
-                *       not be one. Due to CEF_ASYNC flag (translated
-                *       to LDLM_FL_HAS_INTENT by osc), this is
-                *       glimpse request, that won't revoke any
-                *       conflicting DLM locks held. Instead,
-                *       ll_glimpse_callback() will be called on each
-                *       client holding a DLM lock against this file,
-                *       and resulting size will be returned for each
-                *       stripe. DLM lock on [0, EOF] is acquired only
-                *       if there were no conflicting locks. If there
-                *       were conflicting locks, enqueuing or waiting
-                *       fails with -ENAVAIL, but valid inode
-                *       attributes are returned anyway. */
-               *descr = whole_file;
-               descr->cld_obj = clob;
-               descr->cld_mode = CLM_READ;
-               descr->cld_enq_flags = CEF_ASYNC | CEF_MUST;
-               if (agl)
-                       descr->cld_enq_flags |= CEF_AGL;
-               /*
-                * CEF_ASYNC is used because glimpse sub-locks cannot
-                * deadlock (because they never conflict with other
-                * locks) and, hence, can be enqueued out-of-order.
-                *
-                * CEF_MUST protects glimpse lock from conversion into
-                * a lockless mode.
-                */
-               result = cl_lock_request(env, io, lock);
-               if (result < 0)
-                       RETURN(result);
 
-               if (!agl) {
-                       ll_merge_attr(env, inode);
-                       if (i_size_read(inode) > 0 && inode->i_blocks == 0) {
-                               /*
-                                * LU-417: Add dirty pages block count
-                                * lest i_blocks reports 0, some "cp" or
-                                * "tar" may think it's a completely
-                                * sparse file and skip it.
-                                */
-                               inode->i_blocks = dirty_cnt(inode);
-                       }
-               }
-
-               cl_lock_release(env, lock);
-       } else {
-               CDEBUG(D_DLMTRACE, "No objects for inode\n");
+       /* NOTE: this looks like DLM lock request, but it may
+        *       not be one. Due to CEF_ASYNC flag (translated
+        *       to LDLM_FL_HAS_INTENT by osc), this is
+        *       glimpse request, that won't revoke any
+        *       conflicting DLM locks held. Instead,
+        *       ll_glimpse_callback() will be called on each
+        *       client holding a DLM lock against this file,
+        *       and resulting size will be returned for each
+        *       stripe. DLM lock on [0, EOF] is acquired only
+        *       if there were no conflicting locks. If there
+        *       were conflicting locks, enqueuing or waiting
+        *       fails with -ENAVAIL, but valid inode
+        *       attributes are returned anyway. */
+       *descr = whole_file;
+       descr->cld_obj = clob;
+       descr->cld_mode = CLM_READ;
+       descr->cld_enq_flags = CEF_ASYNC | CEF_MUST;
+       if (agl)
+               descr->cld_enq_flags |= CEF_AGL;
+       /*
+        * CEF_ASYNC is used because glimpse sub-locks cannot
+        * deadlock (because they never conflict with other
+        * locks) and, hence, can be enqueued out-of-order.
+        *
+        * CEF_MUST protects glimpse lock from conversion into
+        * a lockless mode.
+        */
+       result = cl_lock_request(env, io, lock);
+       if (result < 0)
+               RETURN(result);
+
+       if (!agl) {
                ll_merge_attr(env, inode);
+               if (i_size_read(inode) > 0 && inode->i_blocks == 0) {
+                       /*
+                        * LU-417: Add dirty pages block count
+                        * lest i_blocks reports 0, some "cp" or
+                        * "tar" may think it's a completely
+                        * sparse file and skip it.
+                        */
+                       inode->i_blocks = dirty_cnt(inode);
+               }
        }
 
+       cl_lock_release(env, lock);
+
        RETURN(result);
 }
 
 static int cl_io_get(struct inode *inode, struct lu_env **envout,
-                    struct cl_io **ioout, int *refcheck)
+                    struct cl_io **ioout, __u16 *refcheck)
 {
        struct lu_env           *env;
        struct cl_io            *io;
@@ -188,8 +182,8 @@ int cl_glimpse_size0(struct inode *inode, int agl)
          */
         struct lu_env          *env = NULL;
         struct cl_io           *io  = NULL;
+       __u16                   refcheck;
         int                     result;
-        int                     refcheck;
 
         ENTRY;
 
@@ -216,42 +210,3 @@ int cl_glimpse_size0(struct inode *inode, int agl)
        }
        RETURN(result);
 }
-
-int cl_local_size(struct inode *inode)
-{
-        struct lu_env           *env = NULL;
-        struct cl_io            *io  = NULL;
-        struct cl_object        *clob;
-        int                      result;
-        int                      refcheck;
-
-        ENTRY;
-
-       if (!ll_i2info(inode)->lli_has_smd)
-                RETURN(0);
-
-        result = cl_io_get(inode, &env, &io, &refcheck);
-        if (result <= 0)
-                RETURN(result);
-
-        clob = io->ci_obj;
-        result = cl_io_init(env, io, CIT_MISC, clob);
-        if (result > 0)
-                result = io->ci_result;
-       else if (result == 0) {
-               struct cl_lock *lock = vvp_env_lock(env);
-
-               lock->cll_descr = whole_file;
-               lock->cll_descr.cld_enq_flags = CEF_PEEK;
-               lock->cll_descr.cld_obj = clob;
-               result = cl_lock_request(env, io, lock);
-               if (result == 0) {
-                       ll_merge_attr(env, inode);
-                       cl_lock_release(env, lock);
-               }
-       }
-       cl_io_fini(env, io);
-       cl_env_put(env, &refcheck);
-       RETURN(result);
-}
-