Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Viro <viro@math.psu.edu>2002-02-09 06:19:23 -0800
committerDavid S. Miller <davem@redhat.com>2002-02-09 06:19:23 -0800
commit0431923fb7a1f25051ff4435810679a337d25076 (patch)
tree9fa424221a5dc68662e4776ec843743be4255fe8
parent238358ed664c4a9243a62615a6afc00764234d17 (diff)
[PATCH] ->s_id cleanups
Patch converts a bunch of places that hadn't been caught when ->s_id was introduced. Please, apply.
-rw-r--r--fs/dquot.c6
-rw-r--r--fs/lockd/svclock.c20
-rw-r--r--fs/lockd/svcsubs.c2
-rw-r--r--fs/nfsd/export.c6
-rw-r--r--fs/nfsd/nfsfh.c3
-rw-r--r--fs/nfsd/vfs.c4
6 files changed, 17 insertions, 24 deletions
diff --git a/fs/dquot.c b/fs/dquot.c
index 2e4d5922f319..ff2326ae046e 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -289,7 +289,7 @@ static void write_dquot(struct dquot *dquot)
sizeof(struct dqblk), &offset);
if (ret != sizeof(struct dqblk))
printk(KERN_WARNING "VFS: dquota write failed on dev %s\n",
- kdevname(dquot->dq_sb->s_dev));
+ dquot->dq_sb->s_id);
set_fs(fs);
up(sem);
@@ -440,7 +440,7 @@ static void dqput(struct dquot *dquot)
if (!dquot->dq_count) {
printk("VFS: dqput: trying to free free dquot\n");
printk("VFS: device %s, dquot of %s %d\n",
- kdevname(dquot->dq_sb->s_dev),
+ dquot->dq_sb->s_id,
quotatypes[dquot->dq_type],
dquot->dq_id);
return;
@@ -715,7 +715,7 @@ static void print_warning(struct dquot *dquot, const char warntype)
if (!need_print_warning(dquot, flag))
return;
dquot->dq_flags |= flag;
- tty_write_message(current->tty, (char *)bdevname(dquot->dq_sb->s_dev));
+ tty_write_message(current->tty, dquot->dq_sb->s_id);
if (warntype == ISOFTWARN || warntype == BSOFTWARN)
tty_write_message(current->tty, ": warning, ");
else
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index db4be6f1012f..67c4743d2006 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -306,9 +306,8 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
struct nlm_block *block;
int error;
- dprintk("lockd: nlmsvc_lock(%02x:%02x/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n",
- major(file->f_file.f_dentry->d_inode->i_dev),
- minor(file->f_file.f_dentry->d_inode->i_dev),
+ dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n",
+ file->f_file.f_dentry->d_inode->i_sb->s_id,
file->f_file.f_dentry->d_inode->i_ino,
lock->fl.fl_type, lock->fl.fl_pid,
(long long)lock->fl.fl_start,
@@ -386,9 +385,8 @@ nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock,
{
struct file_lock *fl;
- dprintk("lockd: nlmsvc_testlock(%02x:%02x/%ld, ty=%d, %Ld-%Ld)\n",
- major(file->f_file.f_dentry->d_inode->i_dev),
- minor(file->f_file.f_dentry->d_inode->i_dev),
+ dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n",
+ file->f_file.f_dentry->d_inode->i_sb->s_id,
file->f_file.f_dentry->d_inode->i_ino,
lock->fl.fl_type,
(long long)lock->fl.fl_start,
@@ -419,9 +417,8 @@ nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock)
{
int error;
- dprintk("lockd: nlmsvc_unlock(%02x:%02x/%ld, pi=%d, %Ld-%Ld)\n",
- major(file->f_file.f_dentry->d_inode->i_dev),
- minor(file->f_file.f_dentry->d_inode->i_dev),
+ dprintk("lockd: nlmsvc_unlock(%s/%ld, pi=%d, %Ld-%Ld)\n",
+ file->f_file.f_dentry->d_inode->i_sb->s_id,
file->f_file.f_dentry->d_inode->i_ino,
lock->fl.fl_pid,
(long long)lock->fl.fl_start,
@@ -448,9 +445,8 @@ nlmsvc_cancel_blocked(struct nlm_file *file, struct nlm_lock *lock)
{
struct nlm_block *block;
- dprintk("lockd: nlmsvc_cancel(%02x:%02x/%ld, pi=%d, %Ld-%Ld)\n",
- major(file->f_file.f_dentry->d_inode->i_dev),
- minor(file->f_file.f_dentry->d_inode->i_dev),
+ dprintk("lockd: nlmsvc_cancel(%s/%ld, pi=%d, %Ld-%Ld)\n",
+ file->f_file.f_dentry->d_inode->i_sb->s_id,
file->f_file.f_dentry->d_inode->i_ino,
lock->fl.fl_pid,
(long long)lock->fl.fl_start,
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index 59ed7ae53cd4..6c07d3af87f8 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -128,7 +128,7 @@ nlm_delete_file(struct nlm_file *file)
struct nlm_file **fp, *f;
dprintk("lockd: closing file %s/%ld\n",
- kdevname(inode->i_dev), inode->i_ino);
+ inode->i_sb->s_id, inode->i_ino);
fp = nlm_files + file->f_hash;
while ((f = *fp) != NULL) {
if (f == file) {
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 03c7735c7cb4..6f725d3562cd 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -375,7 +375,6 @@ exp_rootfh(struct svc_client *clp, char *path, struct knfsd_fh *f, int maxsize)
struct nameidata nd;
struct inode *inode;
struct svc_fh fh;
- kdev_t dev;
int err;
err = -EPERM;
@@ -386,11 +385,10 @@ exp_rootfh(struct svc_client *clp, char *path, struct knfsd_fh *f, int maxsize)
return err;
}
inode = nd.dentry->d_inode;
- dev = inode->i_dev;
- dprintk("nfsd: exp_rootfh(%s [%p] %s:%02x:%02x/%ld)\n",
+ dprintk("nfsd: exp_rootfh(%s [%p] %s:%s/%ld)\n",
path, nd.dentry, clp->cl_ident,
- major(dev), minor(dev), (long) inode->i_ino);
+ inode->i_sb->s_id, inode->i_ino);
exp = exp_parent(clp, inode->i_sb, nd.dentry);
if (!exp) {
dprintk("nfsd: exp_rootfh export not found.\n");
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 952e012591a2..82152dc031d9 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -424,8 +424,7 @@ find_fh_dentry(struct super_block *sb, __u32 *datap, int len, int fhtype, int ne
/* It's a directory, or we are required to confirm the file's
* location in the tree.
*/
- dprintk("nfs_fh: need to look harder for %02x:%02x/%d\n",
- major(sb->s_dev), minor(sb->s_dev), datap[0]);
+ dprintk("nfs_fh: need to look harder for %s/%d\n", sb->s_id, datap[0]);
if (!S_ISDIR(result->d_inode->i_mode)) {
nfsdstats.fh_nocache_nondir++;
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index f72b8a01a99c..55a29adf3e0e 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1410,8 +1410,8 @@ nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset,
oldlen = cd.buflen;
/*
- dprintk("nfsd: f_op->readdir(%x/%ld @ %d) buflen = %d (%d)\n",
- file.f_inode->i_dev, file.f_inode->i_ino,
+ dprintk("nfsd: f_op->readdir(%s/%ld @ %d) buflen = %d (%d)\n",
+ file.f_inode->i_sb->s_id, file.f_inode->i_ino,
(int) file.f_pos, (int) oldlen, (int) cd.buflen);
*/
err = file.f_op->readdir(&file, &cd, (filldir_t) func);