#include <linux/lustre_lite.h>
#include <linux/lprocfs_status.h>
#include <linux/seq_file.h>
+#include <linux/obd_support.h>
#include "llite_internal.h"
return rc;
}
+static int ll_rd_kbytesavail(char *page, char **start, off_t off, int count,
+ int *eof, void *data)
+{
+ struct super_block *sb = (struct super_block *)data;
+ struct obd_statfs osfs;
+ int rc;
+
+ LASSERT(sb != NULL);
+ rc = ll_statfs_internal(sb, &osfs, jiffies - HZ);
+ if (!rc) {
+ __u32 blk_size = osfs.os_bsize >> 10;
+ __u64 result = osfs.os_bavail;
+
+ while (blk_size >>= 1)
+ result <<= 1;
+
+ *eof = 1;
+ rc = snprintf(page, count, LPU64"\n", result);
+ }
+ return rc;
+}
+
static int ll_rd_filestotal(char *page, char **start, off_t off, int count,
int *eof, void *data)
{
}
-#if 0
-static int ll_rd_path(char *page, char **start, off_t off, int count, int *eof,
- void *data)
-{
- return 0;
-}
-#endif
-
static int ll_rd_fstype(char *page, char **start, off_t off, int count,
int *eof, void *data)
{
RETURN(count);
}
+static int ll_rd_max_read_ahead_mb(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
+ struct super_block *sb = data;
+ struct ll_sb_info *sbi = ll_s2sbi(sb);
+ unsigned val;
+
+ spin_lock(&sbi->ll_lock);
+ val = (sbi->ll_max_read_ahead_pages << PAGE_CACHE_SHIFT) >> 20;
+ spin_unlock(&sbi->ll_lock);
+
+ return snprintf(page, count, "%u\n", val);
+}
+
+static int ll_wr_max_read_ahead_mb(struct file *file, const char *buffer,
+ unsigned long count, void *data)
+{
+ struct super_block *sb = data;
+ struct ll_sb_info *sbi = ll_s2sbi(sb);
+ int val, rc;
+
+ rc = lprocfs_write_helper(buffer, count, &val);
+ if (rc)
+ return rc;
+
+ if (val < 0 || val > (num_physpages << PAGE_SHIFT) >> 20)
+ return -ERANGE;
+
+ spin_lock(&sbi->ll_lock);
+ sbi->ll_max_read_ahead_pages = (val << 20) >> PAGE_CACHE_SHIFT;
+ spin_unlock(&sbi->ll_lock);
+
+ return count;
+}
+
static struct lprocfs_vars lprocfs_obd_vars[] = {
{ "uuid", ll_rd_sb_uuid, 0, 0 },
//{ "mntpt_path", ll_rd_path, 0, 0 },
{ "blocksize", ll_rd_blksize, 0, 0 },
{ "kbytestotal", ll_rd_kbytestotal, 0, 0 },
{ "kbytesfree", ll_rd_kbytesfree, 0, 0 },
+ { "kbytesavail", ll_rd_kbytesavail, 0, 0 },
{ "filestotal", ll_rd_filestotal, 0, 0 },
{ "filesfree", ll_rd_filesfree, 0, 0 },
//{ "filegroups", lprocfs_rd_filegroups, 0, 0 },
{ "read_ahead", ll_rd_read_ahead, ll_wr_read_ahead, 0 },
+ { "max_read_ahead_mb", ll_rd_max_read_ahead_mb,
+ ll_wr_max_read_ahead_mb, 0 },
{ 0 }
};
return 0;
}
- spin_lock(&sbi->ll_pglist_lock);
+ spin_lock(&sbi->ll_lock);
llap = llite_pglist_next_llap(sbi, &dummy_llap->llap_proc_item);
if (llap != NULL) {
seq_puts(seq, "]\n");
}
- spin_unlock(&sbi->ll_pglist_lock);
+ spin_unlock(&sbi->ll_lock);
return 0;
}
/* we've just displayed the llap that is after us in the list.
* we advance to a position beyond it, returning null if there
* isn't another llap in the list beyond that new position. */
- spin_lock(&sbi->ll_pglist_lock);
+ spin_lock(&sbi->ll_lock);
llap = llite_pglist_next_llap(sbi, &dummy_llap->llap_proc_item);
list_del_init(&dummy_llap->llap_proc_item);
if (llap) {
list_add(&dummy_llap->llap_proc_item, &llap->llap_proc_item);
llap = llite_pglist_next_llap(sbi, &dummy_llap->llap_proc_item);
}
- spin_unlock(&sbi->ll_pglist_lock);
+ spin_unlock(&sbi->ll_lock);
++*pos;
if (llap == NULL) {
*/
static int llite_dump_pgcache_seq_open(struct inode *inode, struct file *file)
{
- struct proc_dir_entry *dp = inode->u.generic_ip;
+ struct proc_dir_entry *dp = PDE(inode);
struct ll_async_page *llap;
struct seq_file *seq;
struct ll_sb_info *sbi = dp->data;
int rc;
- llap = kmalloc(sizeof(*llap), GFP_KERNEL);
+ OBD_ALLOC_GFP(llap, sizeof(*llap), GFP_KERNEL);
if (llap == NULL)
return -ENOMEM;
llap->llap_page = NULL;
llap->llap_cookie = sbi;
llap->llap_magic = 0;
-
+
rc = seq_open(file, &llite_dump_pgcache_seq_sops);
if (rc) {
- kfree(llap);
+ OBD_FREE(llap, sizeof(*llap));
return rc;
}
seq = file->private_data;
seq->private = llap;
- spin_lock(&sbi->ll_pglist_lock);
+ spin_lock(&sbi->ll_lock);
list_add(&llap->llap_proc_item, &sbi->ll_pglist);
- spin_unlock(&sbi->ll_pglist_lock);
+ spin_unlock(&sbi->ll_lock);
return 0;
}
-static int llite_dump_pgcache_seq_release(struct inode *inode,
+static int llite_dump_pgcache_seq_release(struct inode *inode,
struct file *file)
{
struct seq_file *seq = file->private_data;
struct ll_async_page *llap = seq->private;
struct ll_sb_info *sbi = llap->llap_cookie;
- spin_lock(&sbi->ll_pglist_lock);
+ spin_lock(&sbi->ll_lock);
if (!list_empty(&llap->llap_proc_item))
list_del_init(&llap->llap_proc_item);
- spin_unlock(&sbi->ll_pglist_lock);
- kfree(llap);
+ spin_unlock(&sbi->ll_lock);
+ OBD_FREE(llap, sizeof(*llap));
return seq_release(inode, file);
}
struct file_operations llite_dump_pgcache_fops = {
+ .owner = THIS_MODULE,
.open = llite_dump_pgcache_seq_open,
.read = seq_read,
- .release = llite_dump_pgcache_seq_release,
+ .release = llite_dump_pgcache_seq_release,
};
#endif /* LPROCFS */