#include <linux/module.h>
#include <linux/version.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/obd_class.h>
#include <linux/lustre_dlm.h>
#include "filter_internal.h"
+/* Called with res->lr_lvb_sem held */
static int filter_lvbo_init(struct ldlm_resource *res)
{
- int rc = 0;
struct ost_lvb *lvb = NULL;
+ struct filter_obd *filter;
struct obd_device *obd;
struct dentry *dentry;
+ __u64 ogr, oid;
+ int rc = 0;
ENTRY;
LASSERT(res);
+ LASSERT(down_trylock(&res->lr_lvb_sem) != 0);
/* we only want lvb's for object resources */
/* check for internal locks: these have name[1] != 0 */
if (res->lr_name.name[1])
RETURN(0);
- down(&res->lr_lvb_sem);
if (res->lr_lvb_data)
GOTO(out, rc = 0);
res->lr_lvb_len = sizeof(*lvb);
obd = res->lr_namespace->ns_lvbp;
+ filter = &obd->u.filter;
LASSERT(obd != NULL);
- dentry = filter_fid2dentry(obd, NULL, 0, res->lr_name.name[0]);
+ oid = res->lr_name.name[0];
+ ogr = res->lr_name.name[2];
+
+ dentry = filter_id2dentry(obd, NULL, ogr, oid);
if (IS_ERR(dentry))
GOTO(out, rc = PTR_ERR(dentry));
- if (dentry->d_inode == NULL)
- GOTO(out, rc = -ENOENT);
-
- lvb->lvb_size = dentry->d_inode->i_size;
- lvb->lvb_mtime = LTIME_S(dentry->d_inode->i_mtime);
- lvb->lvb_blocks = dentry->d_inode->i_blocks;
- f_dput(dentry);
+ if (dentry->d_inode == NULL) {
+ lvb->lvb_size = 0;
+ lvb->lvb_blocks = 0;
+ lvb->lvb_mtime = LTIME_S(CURRENT_TIME);
+ } else {
+ lvb->lvb_size = dentry->d_inode->i_size;
+ lvb->lvb_blocks = dentry->d_inode->i_blocks;
+ lvb->lvb_mtime = LTIME_S(dentry->d_inode->i_mtime);
+ }
CDEBUG(D_DLMTRACE, "res: "LPU64" initial lvb size: "LPU64", "
- "mtime: "LPU64", blocks: "LPU64"\n",
- res->lr_name.name[0], lvb->lvb_size,
- lvb->lvb_mtime, lvb->lvb_blocks);
+ "mtime: "LPU64", blocks: "LPU64"\n", res->lr_name.name[0],
+ lvb->lvb_size, lvb->lvb_mtime, lvb->lvb_blocks);
- out:
- /* Don't free lvb data on lookup error */
- up(&res->lr_lvb_sem);
+ f_dput(dentry);
+ EXIT;
+out:
+ /* don't free lvb data on lookup error */
return rc;
}
static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m,
int buf_idx, int increase)
{
- int rc = 0;
struct ost_lvb *lvb = res->lr_lvb_data;
struct obd_device *obd;
+ struct obdo *oa = NULL;
struct dentry *dentry;
+ int rc = 0;
ENTRY;
LASSERT(res);
lvb->lvb_mtime, new->lvb_mtime);
lvb->lvb_mtime = new->lvb_mtime;
}
- if (new->lvb_blocks > lvb->lvb_blocks || !increase) {
- CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb blocks: "
+ if (new->lvb_atime > lvb->lvb_atime || !increase) {
+ CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb atime: "
LPU64" -> "LPU64"\n", res->lr_name.name[0],
- lvb->lvb_blocks, new->lvb_blocks);
- lvb->lvb_blocks = new->lvb_blocks;
+ lvb->lvb_atime, new->lvb_atime);
+ lvb->lvb_atime = new->lvb_atime;
+ }
+ if (new->lvb_ctime > lvb->lvb_ctime || !increase) {
+ CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb ctime: "
+ LPU64" -> "LPU64"\n", res->lr_name.name[0],
+ lvb->lvb_ctime, new->lvb_ctime);
+ lvb->lvb_ctime = new->lvb_ctime;
}
- GOTO(out, rc = 0);
}
/* Update the LVB from the disk inode */
obd = res->lr_namespace->ns_lvbp;
LASSERT(obd);
- dentry = filter_fid2dentry(obd, NULL, 0, res->lr_name.name[0]);
+ oa = obdo_alloc();
+ if (oa == NULL)
+ GOTO(out, rc = -ENOMEM);
+
+ oa->o_id = res->lr_name.name[0];
+ oa->o_gr = res->lr_name.name[2];
+ oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
+ dentry = filter_oa2dentry(obd, oa);
if (IS_ERR(dentry))
GOTO(out, rc = PTR_ERR(dentry));
+ /* Limit the valid bits in the return data to what we actually use */
+ oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
+ obdo_from_inode(oa, dentry->d_inode, FILTER_VALID_FLAGS);
+
if (dentry->d_inode->i_size > lvb->lvb_size || !increase) {
CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb size from disk: "
LPU64" -> %llu\n", res->lr_name.name[0],
lvb->lvb_mtime, LTIME_S(dentry->d_inode->i_mtime));
lvb->lvb_mtime = LTIME_S(dentry->d_inode->i_mtime);
}
+ if (LTIME_S(dentry->d_inode->i_atime) > lvb->lvb_atime || !increase) {
+ CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb atime from disk: "
+ LPU64" -> %lu\n", res->lr_name.name[0],
+ lvb->lvb_atime, LTIME_S(dentry->d_inode->i_atime));
+ lvb->lvb_atime = LTIME_S(dentry->d_inode->i_atime);
+ }
+ if (LTIME_S(dentry->d_inode->i_ctime) > lvb->lvb_ctime || !increase) {
+ CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb ctime from disk: "
+ LPU64" -> %lu\n", res->lr_name.name[0],
+ lvb->lvb_ctime, LTIME_S(dentry->d_inode->i_ctime));
+ lvb->lvb_ctime = LTIME_S(dentry->d_inode->i_ctime);
+ }
CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb blocks from disk: "
LPU64" -> %lu\n", res->lr_name.name[0],
lvb->lvb_blocks, dentry->d_inode->i_blocks);
lvb->lvb_blocks = dentry->d_inode->i_blocks;
f_dput(dentry);
-
- out:
+out:
+ if (oa)
+ obdo_free(oa);
up(&res->lr_lvb_sem);
return rc;
}
-
-
struct ldlm_valblock_ops filter_lvbo = {
lvbo_init: filter_lvbo_init,
lvbo_update: filter_lvbo_update
git://git.whamcloud.com / fs / lustre-release.git / blobdiff