NFS: Convert struct nfs_open_context to use a kref (3bec63db) · Commits · e / devices / android_kernel_fairphone_FP5

fs/nfs/inode.c

+23 −17

Original line number	Diff line number	Diff line
		@@ -461,7 +461,6 @@ static struct nfs_open_context alloc_nfs_open_context(struct vfsmount mnt, str

		ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
		if (ctx != NULL) {
		atomic_set(&ctx->count, 1);
		ctx->path.dentry = dget(dentry);
		ctx->path.mnt = mntget(mnt);
		ctx->cred = get_rpccred(cred);
		@@ -469,6 +468,7 @@ static struct nfs_open_context alloc_nfs_open_context(struct vfsmount mnt, str
		ctx->lockowner = current->files;
		ctx->error = 0;
		ctx->dir_cookie = 0;
		kref_init(&ctx->kref);
		}
		return ctx;
		}
		@@ -476,13 +476,15 @@ static struct nfs_open_context alloc_nfs_open_context(struct vfsmount mnt, str
		struct nfs_open_context get_nfs_open_context(struct nfs_open_context ctx)
		{
		if (ctx != NULL)
		atomic_inc(&ctx->count);
		kref_get(&ctx->kref);
		return ctx;
		}

		void put_nfs_open_context(struct nfs_open_context *ctx)
		static void nfs_free_open_context(struct kref *kref)
		{
		if (atomic_dec_and_test(&ctx->count)) {
		struct nfs_open_context *ctx = container_of(kref,
		struct nfs_open_context, kref);

		if (!list_empty(&ctx->list)) {
		struct inode *inode = ctx->path.dentry->d_inode;
		spin_lock(&inode->i_lock);
		@@ -497,6 +499,10 @@ void put_nfs_open_context(struct nfs_open_context *ctx)
		mntput(ctx->path.mnt);
		kfree(ctx);
		}

		void put_nfs_open_context(struct nfs_open_context *ctx)
		{
		kref_put(&ctx->kref, nfs_free_open_context);
		}

		/*

+2 −1