nfs: replace NFS_FILEID() and nfsi->fileid with inode->i_ino

Now that inode->i_ino stores the full 64-bit NFS fileid, replace all
uses of NFS_FILEID(), set_nfs_fileid(), and direct nfsi->fileid
accesses with inode->i_ino throughout the NFS client.

Remove the NFS_FILEID() and set_nfs_fileid() helper functions from
include/linux/nfs_fs.h since they are no longer needed.

Also fix two pre-existing truncation bugs in nfs4trace.h where fileid
trace fields were declared as u32 instead of u64.

Assisted-by: Claude:claude-opus-4-6
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Anna Schumaker <anna.schumaker@hammerspace.com>

diff --git a/fs/nfs/export.c b/fs/nfs/export.c
index a10dd5f9d0786eb111113bf524a1af8b7da0fb6e..8fb08bce0623a566d75acf30914b7c3054b83012 100644 (file)
--- a/fs/nfs/export.c
+++ b/fs/nfs/export.c
@@ -49,14 +49,14 @@ nfs_encode_fh(struct inode *inode, __u32 *p, int *max_len, struct inode *parent)
                return FILEID_INVALID;
        }
 
-       p[FILEID_HIGH_OFF] = NFS_FILEID(inode) >> 32;
-       p[FILEID_LOW_OFF] = NFS_FILEID(inode);
+       p[FILEID_HIGH_OFF] = inode->i_ino >> 32;
+       p[FILEID_LOW_OFF] = inode->i_ino;
        p[FILE_I_TYPE_OFF] = inode->i_mode & S_IFMT;
        p[len - 1] = 0; /* Padding */
        nfs_copy_fh(clnt_fh, server_fh);
        *max_len = len;
        dprintk("%s: result fh fileid %llu mode %u size %d\n",
-               __func__, NFS_FILEID(inode), inode->i_mode, *max_len);
+               __func__, inode->i_ino, inode->i_mode, *max_len);
        return *max_len;
 }
 

diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c
index e85380e3b11d7271a9b795e62840074834d77a72..f0f53f5dc87194573b2ab193f0b48e66e4cad6d8 100644 (file)
--- a/fs/nfs/filelayout/filelayout.c
+++ b/fs/nfs/filelayout/filelayout.c
@@ -95,7 +95,7 @@ static void filelayout_reset_write(struct nfs_pgio_header *hdr)
                        "(req %s/%llu, %u bytes @ offset %llu)\n", __func__,
                        hdr->task.tk_pid,
                        hdr->inode->i_sb->s_id,
-                       (unsigned long long)NFS_FILEID(hdr->inode),
+                       (unsigned long long)hdr->inode->i_ino,
                        hdr->args.count,
                        (unsigned long long)hdr->args.offset);
 
@@ -112,7 +112,7 @@ static void filelayout_reset_read(struct nfs_pgio_header *hdr)
                        "(req %s/%llu, %u bytes @ offset %llu)\n", __func__,
                        hdr->task.tk_pid,
                        hdr->inode->i_sb->s_id,
-                       (unsigned long long)NFS_FILEID(hdr->inode),
+                       (unsigned long long)hdr->inode->i_ino,
                        hdr->args.count,
                        (unsigned long long)hdr->args.offset);
 

diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index 8b1559171fe3977f1b8461db6266c8c0d6c51ba5..6a84d85e0651f7a1dc931fb7f3c92941d77efb8c 100644 (file)
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -1230,7 +1230,7 @@ static void ff_layout_reset_write(struct nfs_pgio_header *hdr, bool retry_pnfs)
                        "(req %s/%llu, %u bytes @ offset %llu)\n", __func__,
                        hdr->task.tk_pid,
                        hdr->inode->i_sb->s_id,
-                       (unsigned long long)NFS_FILEID(hdr->inode),
+                       (unsigned long long)hdr->inode->i_ino,
                        hdr->args.count,
                        (unsigned long long)hdr->args.offset);
 
@@ -1243,7 +1243,7 @@ static void ff_layout_reset_write(struct nfs_pgio_header *hdr, bool retry_pnfs)
                        "(req %s/%llu, %u bytes @ offset %llu)\n", __func__,
                        hdr->task.tk_pid,
                        hdr->inode->i_sb->s_id,
-                       (unsigned long long)NFS_FILEID(hdr->inode),
+                       (unsigned long long)hdr->inode->i_ino,
                        hdr->args.count,
                        (unsigned long long)hdr->args.offset);
 
@@ -1283,7 +1283,7 @@ static void ff_layout_reset_read(struct nfs_pgio_header *hdr)
                        "(req %s/%llu, %u bytes @ offset %llu)\n", __func__,
                        hdr->task.tk_pid,
                        hdr->inode->i_sb->s_id,
-                       (unsigned long long)NFS_FILEID(hdr->inode),
+                       (unsigned long long)hdr->inode->i_ino,
                        hdr->args.count,
                        (unsigned long long)hdr->args.offset);
 

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index a21ed1c7f89db4f3e0ace1a34eb72de4851065df..0d9451a2ad8ed9a17419747b2ca92b65a5947ec2 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -303,7 +303,7 @@ nfs_find_actor(struct inode *inode, void *opaque)
        struct nfs_fh           *fh = desc->fh;
        struct nfs_fattr        *fattr = desc->fattr;
 
-       if (NFS_FILEID(inode) != fattr->fileid)
+       if (inode->i_ino != fattr->fileid)
                return 0;
        if (inode_wrong_type(inode, fattr->mode))
                return 0;
@@ -320,7 +320,7 @@ nfs_init_locked(struct inode *inode, void *opaque)
        struct nfs_find_desc    *desc = opaque;
        struct nfs_fattr        *fattr = desc->fattr;
 
-       set_nfs_fileid(inode, fattr->fileid);
+       inode->i_ino = fattr->fileid;
        inode->i_mode = fattr->mode;
        nfs_copy_fh(NFS_FH(inode), desc->fh);
        return 0;
@@ -580,7 +580,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
        }
        dprintk("NFS: nfs_fhget(%s/%Lu fh_crc=0x%08x ct=%d)\n",
                inode->i_sb->s_id,
-               (unsigned long long)NFS_FILEID(inode),
+               (unsigned long long)inode->i_ino,
                nfs_display_fhandle_hash(fh),
                icount_read(inode));
 
@@ -1343,7 +1343,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
        struct nfs_inode *nfsi = NFS_I(inode);
 
        dfprintk(PAGECACHE, "NFS: revalidating (%s/%Lu)\n",
-               inode->i_sb->s_id, (unsigned long long)NFS_FILEID(inode));
+               inode->i_sb->s_id, (unsigned long long)inode->i_ino);
 
        trace_nfs_revalidate_inode_enter(inode);
 
@@ -1373,7 +1373,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
        if (status != 0) {
                dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Lu) getattr failed, error=%d\n",
                         inode->i_sb->s_id,
-                        (unsigned long long)NFS_FILEID(inode), status);
+                        (unsigned long long)inode->i_ino, status);
                switch (status) {
                case -ETIMEDOUT:
                        /* A soft timeout occurred. Use cached information? */
@@ -1393,7 +1393,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
        if (status) {
                dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Lu) refresh failed, error=%d\n",
                         inode->i_sb->s_id,
-                        (unsigned long long)NFS_FILEID(inode), status);
+                        (unsigned long long)inode->i_ino, status);
                goto out;
        }
 
@@ -1404,7 +1404,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
 
        dfprintk(PAGECACHE, "NFS: (%s/%Lu) revalidation complete\n",
                inode->i_sb->s_id,
-               (unsigned long long)NFS_FILEID(inode));
+               (unsigned long long)inode->i_ino);
 
 out:
        nfs_free_fattr(fattr);
@@ -1453,7 +1453,7 @@ static int nfs_invalidate_mapping(struct inode *inode, struct address_space *map
 
        dfprintk(PAGECACHE, "NFS: (%s/%Lu) data cache invalidated\n",
                        inode->i_sb->s_id,
-                       (unsigned long long)NFS_FILEID(inode));
+                       (unsigned long long)inode->i_ino);
        return 0;
 }
 

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index a9b8d482d28946ad6eaac57c68f23ce3b52d47db..60024b978ee0591347a9ed423f0f4691751a365e 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -377,7 +377,7 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent
                *p++ = htonl(attrs);                           /* bitmap */
                *p++ = htonl(12);             /* attribute buffer length */
                *p++ = htonl(NF4DIR);
-               p = xdr_encode_hyper(p, NFS_FILEID(d_inode(dentry)));
+               p = xdr_encode_hyper(p, d_inode(dentry)->i_ino);
        }
        
        *p++ = xdr_one;                                  /* next */
@@ -391,7 +391,7 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent
        *p++ = htonl(12);             /* attribute buffer length */
        *p++ = htonl(NF4DIR);
        spin_lock(&dentry->d_lock);
-       p = xdr_encode_hyper(p, NFS_FILEID(d_inode(dentry->d_parent)));
+       p = xdr_encode_hyper(p, d_inode(dentry->d_parent)->i_ino);
        spin_unlock(&dentry->d_lock);
 
        readdir->pgbase = (char *)p - (char *)start;

diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index c939533b9881a1f3e9afddf8a79f5abbde9d54ce..1ed677810d9dd3c09d74f07f5106ce30e2d72366 100644 (file)
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -597,13 +597,13 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
                                __entry->openstateid_hash = 0;
                        }
                        if (inode != NULL) {
-                               __entry->fileid = NFS_FILEID(inode);
+                               __entry->fileid = inode->i_ino;
                                __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        } else {
                                __entry->fileid = 0;
                                __entry->fhandle = 0;
                        }
-                       __entry->dir = NFS_FILEID(d_inode(ctx->dentry->d_parent));
+                       __entry->dir = d_inode(ctx->dentry->d_parent)->i_ino;
                        __assign_str(name);
                ),
 
@@ -658,7 +658,7 @@ TRACE_EVENT(nfs4_cached_open,
                        const struct inode *inode = state->inode;
 
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->fmode = (__force unsigned int)state->state;
                        __entry->stateid_seq =
@@ -703,7 +703,7 @@ TRACE_EVENT(nfs4_close,
                        const struct inode *inode = state->inode;
 
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->fmode = (__force unsigned int)state->state;
                        __entry->error = error < 0 ? -error : 0;
@@ -759,7 +759,7 @@ DECLARE_EVENT_CLASS(nfs4_lock_event,
                        __entry->start = request->fl_start;
                        __entry->end = request->fl_end;
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->stateid_seq =
                                be32_to_cpu(state->stateid.seqid);
@@ -831,7 +831,7 @@ TRACE_EVENT(nfs4_set_lock,
                        __entry->start = request->fl_start;
                        __entry->end = request->fl_end;
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->stateid_seq =
                                be32_to_cpu(state->stateid.seqid);
@@ -922,7 +922,7 @@ TRACE_EVENT(nfs4_state_lock_reclaim,
                        const struct inode *inode = state->inode;
 
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->state_flags = state->flags;
                        __entry->lock_flags = lock->ls_flags;
@@ -960,7 +960,7 @@ DECLARE_EVENT_CLASS(nfs4_set_delegation_event,
 
                TP_fast_assign(
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->fmode = (__force unsigned int)fmode;
                ),
@@ -1087,7 +1087,7 @@ DECLARE_EVENT_CLASS(nfs4_test_stateid_event,
 
                        __entry->error = error < 0 ? -error : 0;
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->stateid_seq =
                                be32_to_cpu(state->stateid.seqid);
@@ -1137,7 +1137,7 @@ DECLARE_EVENT_CLASS(nfs4_lookup_event,
 
                TP_fast_assign(
                        __entry->dev = dir->i_sb->s_dev;
-                       __entry->dir = NFS_FILEID(dir);
+                       __entry->dir = dir->i_ino;
                        __entry->error = -error;
                        __assign_str(name);
                ),
@@ -1185,7 +1185,7 @@ TRACE_EVENT(nfs4_lookupp,
 
                TP_fast_assign(
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->ino = NFS_FILEID(inode);
+                       __entry->ino = inode->i_ino;
                        __entry->error = error < 0 ? -error : 0;
                ),
 
@@ -1220,8 +1220,8 @@ TRACE_EVENT(nfs4_rename,
 
                TP_fast_assign(
                        __entry->dev = olddir->i_sb->s_dev;
-                       __entry->olddir = NFS_FILEID(olddir);
-                       __entry->newdir = NFS_FILEID(newdir);
+                       __entry->olddir = olddir->i_ino;
+                       __entry->newdir = newdir->i_ino;
                        __entry->error = error < 0 ? -error : 0;
                        __assign_str(oldname);
                        __assign_str(newname);
@@ -1258,7 +1258,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_event,
 
                TP_fast_assign(
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->error = error < 0 ? -error : 0;
                ),
@@ -1311,7 +1311,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_event,
 
                TP_fast_assign(
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->error = error < 0 ? -error : 0;
                        __entry->stateid_seq =
@@ -1421,7 +1421,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_callback_event,
                        __entry->error = error < 0 ? -error : 0;
                        __entry->fhandle = nfs_fhandle_hash(fhandle);
                        if (!IS_ERR_OR_NULL(inode)) {
-                               __entry->fileid = NFS_FILEID(inode);
+                               __entry->fileid = inode->i_ino;
                                __entry->dev = inode->i_sb->s_dev;
                        } else {
                                __entry->fileid = 0;
@@ -1478,7 +1478,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_callback_event,
                        __entry->error = error < 0 ? -error : 0;
                        __entry->fhandle = nfs_fhandle_hash(fhandle);
                        if (!IS_ERR_OR_NULL(inode)) {
-                               __entry->fileid = NFS_FILEID(inode);
+                               __entry->fileid = inode->i_ino;
                                __entry->dev = inode->i_sb->s_dev;
                        } else {
                                __entry->fileid = 0;
@@ -1655,7 +1655,7 @@ DECLARE_EVENT_CLASS(nfs4_read_event,
                        const struct pnfs_layout_segment *lseg = hdr->lseg;
 
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(fh);
                        __entry->offset = hdr->args.offset;
                        __entry->arg_count = hdr->args.count;
@@ -1727,7 +1727,7 @@ DECLARE_EVENT_CLASS(nfs4_write_event,
                        const struct pnfs_layout_segment *lseg = hdr->lseg;
 
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(fh);
                        __entry->offset = hdr->args.offset;
                        __entry->arg_count = hdr->args.count;
@@ -1795,7 +1795,7 @@ DECLARE_EVENT_CLASS(nfs4_commit_event,
                        const struct pnfs_layout_segment *lseg = data->lseg;
 
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(fh);
                        __entry->offset = data->args.offset;
                        __entry->count = data->args.count;
@@ -1857,7 +1857,7 @@ TRACE_EVENT(nfs4_layoutget,
                        const struct inode *inode = d_inode(ctx->dentry);
                        const struct nfs4_state *state = ctx->state;
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->iomode = args->iomode;
                        __entry->offset = args->offset;
@@ -1957,7 +1957,7 @@ TRACE_EVENT(pnfs_update_layout,
                ),
                TP_fast_assign(
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->pos = pos;
                        __entry->count = count;
@@ -2012,7 +2012,7 @@ DECLARE_EVENT_CLASS(pnfs_layout_event,
                ),
                TP_fast_assign(
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->pos = pos;
                        __entry->count = count;
@@ -2194,7 +2194,7 @@ DECLARE_EVENT_CLASS(nfs4_flexfiles_io_event,
                        __entry->error = -error;
                        __entry->nfs_error = hdr->res.op_status;
                        __entry->fhandle = nfs_fhandle_hash(hdr->args.fh);
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->dev = inode->i_sb->s_dev;
                        __entry->offset = hdr->args.offset;
                        __entry->count = hdr->args.count;
@@ -2258,7 +2258,7 @@ TRACE_EVENT(ff_layout_commit_error,
                        __entry->error = -error;
                        __entry->nfs_error = data->res.op_status;
                        __entry->fhandle = nfs_fhandle_hash(data->args.fh);
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->dev = inode->i_sb->s_dev;
                        __entry->offset = data->args.offset;
                        __entry->count = data->args.count;
@@ -2423,7 +2423,7 @@ TRACE_EVENT(nfs4_llseek,
                TP_STRUCT__entry(
                        __field(unsigned long, error)
                        __field(u32, fhandle)
-                       __field(u32, fileid)
+                       __field(u64, fileid)
                        __field(dev_t, dev)
                        __field(int, stateid_seq)
                        __field(u32, stateid_hash)
@@ -2434,10 +2434,9 @@ TRACE_EVENT(nfs4_llseek,
                ),
 
                TP_fast_assign(
-                       const struct nfs_inode *nfsi = NFS_I(inode);
                        const struct nfs_fh *fh = args->sa_fh;
 
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->dev = inode->i_sb->s_dev;
                        __entry->fhandle = nfs_fhandle_hash(fh);
                        __entry->offset_s = args->sa_offset;
@@ -2499,7 +2498,7 @@ DECLARE_EVENT_CLASS(nfs4_sparse_event,
                        __entry->offset = args->falloc_offset;
                        __entry->len = args->falloc_length;
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->stateid_seq =
                                be32_to_cpu(args->falloc_stateid.seqid);
@@ -2568,14 +2567,11 @@ TRACE_EVENT(nfs4_copy,
                ),
 
                TP_fast_assign(
-                       const struct nfs_inode *src_nfsi = NFS_I(src_inode);
-                       const struct nfs_inode *dst_nfsi = NFS_I(dst_inode);
-
-                       __entry->src_fileid = src_nfsi->fileid;
+                       __entry->src_fileid = src_inode->i_ino;
                        __entry->src_dev = src_inode->i_sb->s_dev;
                        __entry->src_fhandle = nfs_fhandle_hash(args->src_fh);
                        __entry->src_offset = args->src_pos;
-                       __entry->dst_fileid = dst_nfsi->fileid;
+                       __entry->dst_fileid = dst_inode->i_ino;
                        __entry->dst_dev = dst_inode->i_sb->s_dev;
                        __entry->dst_fhandle = nfs_fhandle_hash(args->dst_fh);
                        __entry->dst_offset = args->dst_pos;
@@ -2666,14 +2662,11 @@ TRACE_EVENT(nfs4_clone,
                ),
 
                TP_fast_assign(
-                       const struct nfs_inode *src_nfsi = NFS_I(src_inode);
-                       const struct nfs_inode *dst_nfsi = NFS_I(dst_inode);
-
-                       __entry->src_fileid = src_nfsi->fileid;
+                       __entry->src_fileid = src_inode->i_ino;
                        __entry->src_dev = src_inode->i_sb->s_dev;
                        __entry->src_fhandle = nfs_fhandle_hash(args->src_fh);
                        __entry->src_offset = args->src_offset;
-                       __entry->dst_fileid = dst_nfsi->fileid;
+                       __entry->dst_fileid = dst_inode->i_ino;
                        __entry->dst_dev = dst_inode->i_sb->s_dev;
                        __entry->dst_fhandle = nfs_fhandle_hash(args->dst_fh);
                        __entry->dst_offset = args->dst_offset;
@@ -2724,7 +2717,7 @@ TRACE_EVENT(nfs4_copy_notify,
                TP_STRUCT__entry(
                        __field(unsigned long, error)
                        __field(u32, fhandle)
-                       __field(u32, fileid)
+                       __field(u64, fileid)
                        __field(dev_t, dev)
                        __field(int, stateid_seq)
                        __field(u32, stateid_hash)
@@ -2733,9 +2726,7 @@ TRACE_EVENT(nfs4_copy_notify,
                ),
 
                TP_fast_assign(
-                       const struct nfs_inode *nfsi = NFS_I(inode);
-
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->dev = inode->i_sb->s_dev;
                        __entry->fhandle = nfs_fhandle_hash(args->cna_src_fh);
                        __entry->stateid_seq =
@@ -2830,7 +2821,7 @@ DECLARE_EVENT_CLASS(nfs4_xattr_event,
                TP_fast_assign(
                        __entry->error = error < 0 ? -error : 0;
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __assign_str(name);
                ),

diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
index ff467959f73387b5a98134c890639f0d0a899541..4ada21f4eebd80c2098e2dfaef83b579db4e358c 100644 (file)
--- a/fs/nfs/nfstrace.h
+++ b/fs/nfs/nfstrace.h
@@ -80,7 +80,7 @@ DECLARE_EVENT_CLASS(nfs_inode_event,
                TP_fast_assign(
                        const struct nfs_inode *nfsi = NFS_I(inode);
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
                        __entry->version = inode_peek_iversion_raw(inode);
                        __entry->cache_validity = nfsi->cache_validity;
@@ -121,7 +121,7 @@ DECLARE_EVENT_CLASS(nfs_inode_event_done,
                        const struct nfs_inode *nfsi = NFS_I(inode);
                        __entry->error = error < 0 ? -error : 0;
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
                        __entry->type = nfs_umode_to_dtype(inode->i_mode);
                        __entry->version = inode_peek_iversion_raw(inode);
@@ -211,7 +211,7 @@ TRACE_EVENT(nfs_access_exit,
                        const struct nfs_inode *nfsi = NFS_I(inode);
                        __entry->error = error < 0 ? -error : 0;
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
                        __entry->type = nfs_umode_to_dtype(inode->i_mode);
                        __entry->version = inode_peek_iversion_raw(inode);
@@ -265,7 +265,7 @@ DECLARE_EVENT_CLASS(nfs_update_size_class,
 
                        __entry->dev = inode->i_sb->s_dev;
                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->version = inode_peek_iversion_raw(inode);
                        __entry->cur_size = i_size_read(inode);
                        __entry->new_size = new_size;
@@ -317,7 +317,7 @@ DECLARE_EVENT_CLASS(nfs_inode_range_event,
 
                        __entry->dev = inode->i_sb->s_dev;
                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->version = inode_peek_iversion_raw(inode);
                        __entry->range_start = range_start;
                        __entry->range_end = range_end;
@@ -371,7 +371,7 @@ DECLARE_EVENT_CLASS(nfs_readdir_event,
                        const struct nfs_inode *nfsi = NFS_I(dir);
 
                        __entry->dev = dir->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = dir->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
                        __entry->version = inode_peek_iversion_raw(dir);
                        if (cookie != 0)
@@ -429,9 +429,9 @@ DECLARE_EVENT_CLASS(nfs_lookup_event,
 
                TP_fast_assign(
                        __entry->dev = dir->i_sb->s_dev;
-                       __entry->dir = NFS_FILEID(dir);
+                       __entry->dir = dir->i_ino;
                        __entry->flags = flags;
-                       __entry->fileid = d_is_negative(dentry) ? 0 : NFS_FILEID(d_inode(dentry));
+                       __entry->fileid = d_is_negative(dentry) ? 0 : d_inode(dentry)->i_ino;
                        __assign_str(name);
                ),
 
@@ -476,10 +476,10 @@ DECLARE_EVENT_CLASS(nfs_lookup_event_done,
 
                TP_fast_assign(
                        __entry->dev = dir->i_sb->s_dev;
-                       __entry->dir = NFS_FILEID(dir);
+                       __entry->dir = dir->i_ino;
                        __entry->error = error < 0 ? -error : 0;
                        __entry->flags = flags;
-                       __entry->fileid = d_is_negative(dentry) ? 0 : NFS_FILEID(d_inode(dentry));
+                       __entry->fileid = d_is_negative(dentry) ? 0 : d_inode(dentry)->i_ino;
                        __assign_str(name);
                ),
 
@@ -532,7 +532,7 @@ TRACE_EVENT(nfs_atomic_open_enter,
 
                TP_fast_assign(
                        __entry->dev = dir->i_sb->s_dev;
-                       __entry->dir = NFS_FILEID(dir);
+                       __entry->dir = dir->i_ino;
                        __entry->flags = flags;
                        __entry->fmode = (__force unsigned long)ctx->mode;
                        __assign_str(name);
@@ -571,7 +571,7 @@ TRACE_EVENT(nfs_atomic_open_exit,
                TP_fast_assign(
                        __entry->error = -error;
                        __entry->dev = dir->i_sb->s_dev;
-                       __entry->dir = NFS_FILEID(dir);
+                       __entry->dir = dir->i_ino;
                        __entry->flags = flags;
                        __entry->fmode = (__force unsigned long)ctx->mode;
                        __assign_str(name);
@@ -608,7 +608,7 @@ TRACE_EVENT(nfs_create_enter,
 
                TP_fast_assign(
                        __entry->dev = dir->i_sb->s_dev;
-                       __entry->dir = NFS_FILEID(dir);
+                       __entry->dir = dir->i_ino;
                        __entry->flags = flags;
                        __assign_str(name);
                ),
@@ -644,7 +644,7 @@ TRACE_EVENT(nfs_create_exit,
                TP_fast_assign(
                        __entry->error = -error;
                        __entry->dev = dir->i_sb->s_dev;
-                       __entry->dir = NFS_FILEID(dir);
+                       __entry->dir = dir->i_ino;
                        __entry->flags = flags;
                        __assign_str(name);
                ),
@@ -676,7 +676,7 @@ DECLARE_EVENT_CLASS(nfs_directory_event,
 
                TP_fast_assign(
                        __entry->dev = dir->i_sb->s_dev;
-                       __entry->dir = NFS_FILEID(dir);
+                       __entry->dir = dir->i_ino;
                        __assign_str(name);
                ),
 
@@ -714,7 +714,7 @@ DECLARE_EVENT_CLASS(nfs_directory_event_done,
 
                TP_fast_assign(
                        __entry->dev = dir->i_sb->s_dev;
-                       __entry->dir = NFS_FILEID(dir);
+                       __entry->dir = dir->i_ino;
                        __entry->error = error < 0 ? -error : 0;
                        __assign_str(name);
                ),
@@ -768,8 +768,8 @@ TRACE_EVENT(nfs_link_enter,
 
                TP_fast_assign(
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
-                       __entry->dir = NFS_FILEID(dir);
+                       __entry->fileid = inode->i_ino;
+                       __entry->dir = dir->i_ino;
                        __assign_str(name);
                ),
 
@@ -803,8 +803,8 @@ TRACE_EVENT(nfs_link_exit,
 
                TP_fast_assign(
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = NFS_FILEID(inode);
-                       __entry->dir = NFS_FILEID(dir);
+                       __entry->fileid = inode->i_ino;
+                       __entry->dir = dir->i_ino;
                        __entry->error = error < 0 ? -error : 0;
                        __assign_str(name);
                ),
@@ -840,8 +840,8 @@ DECLARE_EVENT_CLASS(nfs_rename_event,
 
                TP_fast_assign(
                        __entry->dev = old_dir->i_sb->s_dev;
-                       __entry->old_dir = NFS_FILEID(old_dir);
-                       __entry->new_dir = NFS_FILEID(new_dir);
+                       __entry->old_dir = old_dir->i_ino;
+                       __entry->new_dir = new_dir->i_ino;
                        __assign_str(old_name);
                        __assign_str(new_name);
                ),
@@ -889,8 +889,8 @@ DECLARE_EVENT_CLASS(nfs_rename_event_done,
                TP_fast_assign(
                        __entry->dev = old_dir->i_sb->s_dev;
                        __entry->error = -error;
-                       __entry->old_dir = NFS_FILEID(old_dir);
-                       __entry->new_dir = NFS_FILEID(new_dir);
+                       __entry->old_dir = old_dir->i_ino;
+                       __entry->new_dir = new_dir->i_ino;
                        __assign_str(old_name);
                        __assign_str(new_name);
                ),
@@ -943,7 +943,7 @@ TRACE_EVENT(nfs_sillyrename_unlink,
                        struct inode *dir = d_inode(data->dentry->d_parent);
                        size_t len = data->args.name.len;
                        __entry->dev = dir->i_sb->s_dev;
-                       __entry->dir = NFS_FILEID(dir);
+                       __entry->dir = dir->i_ino;
                        __entry->error = -error;
                        memcpy(__get_str(name),
                                data->args.name.name, len);
@@ -981,7 +981,7 @@ DECLARE_EVENT_CLASS(nfs_folio_event,
                        const struct nfs_inode *nfsi = NFS_I(inode);
 
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
                        __entry->version = inode_peek_iversion_raw(inode);
                        __entry->offset = offset;
@@ -1031,7 +1031,7 @@ DECLARE_EVENT_CLASS(nfs_folio_event_done,
                        const struct nfs_inode *nfsi = NFS_I(inode);
 
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
                        __entry->version = inode_peek_iversion_raw(inode);
                        __entry->offset = offset;
@@ -1109,7 +1109,7 @@ DECLARE_EVENT_CLASS(nfs_kiocb_event,
                        const struct nfs_inode *nfsi = NFS_I(inode);
 
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
                        __entry->version = inode_peek_iversion_raw(inode);
                        __entry->offset = iocb->ki_pos;
@@ -1160,7 +1160,7 @@ TRACE_EVENT(nfs_aop_readahead,
                        const struct nfs_inode *nfsi = NFS_I(inode);
 
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
                        __entry->version = inode_peek_iversion_raw(inode);
                        __entry->offset = pos;
@@ -1199,7 +1199,7 @@ TRACE_EVENT(nfs_aop_readahead_done,
                        const struct nfs_inode *nfsi = NFS_I(inode);
 
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
                        __entry->version = inode_peek_iversion_raw(inode);
                        __entry->nr_pages = nr_pages;
@@ -1239,7 +1239,7 @@ TRACE_EVENT(nfs_initiate_read,
                        __entry->offset = hdr->args.offset;
                        __entry->count = hdr->args.count;
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(fh);
                ),
 
@@ -1284,7 +1284,7 @@ TRACE_EVENT(nfs_readpage_done,
                        __entry->res_count = hdr->res.count;
                        __entry->eof = hdr->res.eof;
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(fh);
                ),
 
@@ -1330,7 +1330,7 @@ TRACE_EVENT(nfs_readpage_short,
                        __entry->res_count = hdr->res.count;
                        __entry->eof = hdr->res.eof;
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(fh);
                ),
 
@@ -1377,7 +1377,7 @@ TRACE_EVENT(nfs_pgio_error,
                __entry->arg_count = hdr->args.count;
                __entry->res_count = hdr->res.count;
                __entry->dev = inode->i_sb->s_dev;
-               __entry->fileid = nfsi->fileid;
+               __entry->fileid = inode->i_ino;
                __entry->fhandle = nfs_fhandle_hash(fh);
        ),
 
@@ -1416,7 +1416,7 @@ TRACE_EVENT(nfs_initiate_write,
                        __entry->count = hdr->args.count;
                        __entry->stable = hdr->args.stable;
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(fh);
                ),
 
@@ -1467,7 +1467,7 @@ TRACE_EVENT(nfs_writeback_done,
                                &verf->verifier,
                                NFS4_VERIFIER_SIZE);
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(fh);
                ),
 
@@ -1507,7 +1507,7 @@ DECLARE_EVENT_CLASS(nfs_page_class,
                        const struct nfs_inode *nfsi = NFS_I(inode);
 
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
                        __entry->req = req;
                        __entry->offset = req_offset(req);
@@ -1555,7 +1555,7 @@ DECLARE_EVENT_CLASS(nfs_page_error_class,
                TP_fast_assign(
                        const struct nfs_inode *nfsi = NFS_I(inode);
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
                        __entry->offset = req_offset(req);
                        __entry->count = req->wb_bytes;
@@ -1609,7 +1609,7 @@ TRACE_EVENT(nfs_initiate_commit,
                        __entry->offset = data->args.offset;
                        __entry->count = data->args.count;
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(fh);
                ),
 
@@ -1655,7 +1655,7 @@ TRACE_EVENT(nfs_commit_done,
                                &verf->verifier,
                                NFS4_VERIFIER_SIZE);
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(fh);
                ),
 
@@ -1701,7 +1701,7 @@ DECLARE_EVENT_CLASS(nfs_direct_req_class,
                        const struct nfs_fh *fh = &nfsi->fh;
 
                        __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
+                       __entry->fileid = inode->i_ino;
                        __entry->fhandle = nfs_fhandle_hash(fh);
                        __entry->offset = dreq->io_start;
                        __entry->count = dreq->count;
@@ -1765,7 +1765,7 @@ DECLARE_EVENT_CLASS(nfs_local_dio_class,
                const struct nfs_fh *fh = &nfsi->fh;
 
                __entry->dev = inode->i_sb->s_dev;
-               __entry->fileid = nfsi->fileid;
+               __entry->fileid = inode->i_ino;
                __entry->fhandle = nfs_fhandle_hash(fh);
                __entry->offset = offset;
                __entry->count = count;

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 4a87b2fdb2e6eb7d0d1202a5858649d2a079db66..7dd478ffc2fab445321d9988e024474c27846de2 100644 (file)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -759,7 +759,7 @@ int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr,
        dprintk("NFS: initiated pgio call "
                "(req %s/%llu, %u bytes @ offset %llu)\n",
                hdr->inode->i_sb->s_id,
-               (unsigned long long)NFS_FILEID(hdr->inode),
+               (unsigned long long)hdr->inode->i_ino,
                hdr->args.count,
                (unsigned long long)hdr->args.offset);
 

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 743467e9ba20257f6be7ad08ab06b97762ea9ddf..fdedeff5f6cc41675ce1e53950866e94196d5502 100644 (file)
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -2373,7 +2373,7 @@ out:
        dprintk("%s: inode %s/%llu pNFS layout segment %s for "
                        "(%s, offset: %llu, length: %llu)\n",
                        __func__, ino->i_sb->s_id,
-                       (unsigned long long)NFS_FILEID(ino),
+                       (unsigned long long)ino->i_ino,
                        IS_ERR_OR_NULL(lseg) ? "not found" : "found",
                        iomode==IOMODE_RW ?  "read/write" : "read-only",
                        (unsigned long long)pos,

diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index df3ca4669df696a0e6d515cab1f36910a624fc91..7f2e84eaaa9f0969ee8463165c6bbbc03845c3ae 100644 (file)
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -461,7 +461,7 @@ nfs_sillyrename(struct inode *dir, struct dentry *dentry)
        if (dentry->d_flags & DCACHE_NFSFS_RENAMED)
                goto out;
 
-       fileid = NFS_FILEID(d_inode(dentry));
+       fileid = d_inode(dentry)->i_ino;
 
        sdentry = NULL;
        do {

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index d7c399763ad94310fab88ebfec8d1029fb31c8e5..fcffb8c9e9df70d318d0fbd7136f1bd060cf11d1 100644 (file)
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1817,7 +1817,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)
 
                dprintk("NFS:       commit (%s/%llu %d@%lld)",
                        nfs_req_openctx(req)->dentry->d_sb->s_id,
-                       (unsigned long long)NFS_FILEID(d_inode(nfs_req_openctx(req)->dentry)),
+                       (unsigned long long)d_inode(nfs_req_openctx(req)->dentry)->i_ino,
                        req->wb_bytes,
                        (long long)req_offset(req));
                if (status < 0) {

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 6d6fa62ede10d3fb9b727ef614433050aa70908d..83063f4ab488055ab6abf5cca85fc53bc5f57a1c 100644 (file)
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -394,16 +394,6 @@ static inline int NFS_STALE(const struct inode *inode)
        return test_bit(NFS_INO_STALE, &NFS_I(inode)->flags);
 }
 
-static inline __u64 NFS_FILEID(const struct inode *inode)
-{
-       return inode->i_ino;
-}
-
-static inline void set_nfs_fileid(struct inode *inode, __u64 fileid)
-{
-       inode->i_ino = fileid;
-}
-
 static inline void nfs_mark_for_revalidate(struct inode *inode)
 {
        struct nfs_inode *nfsi = NFS_I(inode);