diff --git a/[refs] b/[refs] index cc6dc4c1c3f0..33d5fb83a6d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73e39aaa8366694450cd6034050f542f965e277d +refs/heads/master: c34309a45ea491e5f0c0d0af49ccfa018ff35fc1 diff --git a/trunk/include/linux/nfs_fs_sb.h b/trunk/include/linux/nfs_fs_sb.h index 30715508fade..e707c1b69796 100644 --- a/trunk/include/linux/nfs_fs_sb.h +++ b/trunk/include/linux/nfs_fs_sb.h @@ -225,11 +225,6 @@ struct nfs4_slot_table { struct completion complete; }; -static inline int slot_idx(struct nfs4_slot_table *tbl, struct nfs4_slot *sp) -{ - return sp - tbl->slots; -} - /* * Session related parameters */