2012-04-30 17:49:14

by Anna Schumaker

Subject: [PATCH] NFS: Define dummy nfs_init_cinfo() and nfs_init_cinfo_from_inode()

From: Bryan Schumaker <[email protected]>

These are needed when v3 and v4 are not enabled.

Signed-off-by: Bryan Schumaker <[email protected]>
---
fs/nfs/write.c | 12 ++++++++++++
1 file changed, 12 insertions(+)

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 3636191..f0045e0 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -567,6 +567,18 @@ int nfs_write_need_commit(struct nfs_write_data *data)
}

#else
+static void nfs_init_cinfo_from_inode(struct nfs_commit_info *cinfo,
+ struct inode *inode)
+{
+}
+
+void nfs_init_cinfo(struct nfs_commit_info *cinfo,
+ struct inode *inode,
+ struct nfs_direct_req *dreq)
+{
+}
+EXPORT_SYMBOL_GPL(nfs_init_cinfo);
+
void
nfs_mark_request_commit(struct nfs_page *req, struct pnfs_layout_segment *lseg,
struct nfs_commit_info *cinfo)
--
1.7.10

2012-04-30 18:16:52

by Myklebust, Trond

Subject: Re: [PATCH] NFS: Define dummy nfs_init_cinfo() and nfs_init_cinfo_from_inode()

T24gTW9uLCAyMDEyLTA0LTMwIGF0IDEzOjQ4IC0wNDAwLCBianNjaHVtYUBuZXRhcHAuY29tIHdy
b3RlOg0KPiBGcm9tOiBCcnlhbiBTY2h1bWFrZXIgPGJqc2NodW1hQG5ldGFwcC5jb20+DQo+IA0K
PiBUaGVzZSBhcmUgbmVlZGVkIHdoZW4gdjMgYW5kIHY0IGFyZSBub3QgZW5hYmxlZC4NCj4gDQo+
IFNpZ25lZC1vZmYtYnk6IEJyeWFuIFNjaHVtYWtlciA8YmpzY2h1bWFAbmV0YXBwLmNvbT4NCj4g
LS0tDQo+ICBmcy9uZnMvd3JpdGUuYyB8ICAgMTIgKysrKysrKysrKysrDQo+ICAxIGZpbGUgY2hh
bmdlZCwgMTIgaW5zZXJ0aW9ucygrKQ0KPiANCj4gZGlmZiAtLWdpdCBhL2ZzL25mcy93cml0ZS5j
IGIvZnMvbmZzL3dyaXRlLmMNCj4gaW5kZXggMzYzNjE5MS4uZjAwNDVlMCAxMDA2NDQNCj4gLS0t
IGEvZnMvbmZzL3dyaXRlLmMNCj4gKysrIGIvZnMvbmZzL3dyaXRlLmMNCj4gQEAgLTU2Nyw2ICs1
NjcsMTggQEAgaW50IG5mc193cml0ZV9uZWVkX2NvbW1pdChzdHJ1Y3QgbmZzX3dyaXRlX2RhdGEg
KmRhdGEpDQo+ICB9DQo+ICANCj4gICNlbHNlDQo+ICtzdGF0aWMgdm9pZCBuZnNfaW5pdF9jaW5m
b19mcm9tX2lub2RlKHN0cnVjdCBuZnNfY29tbWl0X2luZm8gKmNpbmZvLA0KPiArCQkJCSAgICAg
IHN0cnVjdCBpbm9kZSAqaW5vZGUpDQo+ICt7DQo+ICt9DQo+ICsNCj4gK3ZvaWQgbmZzX2luaXRf
Y2luZm8oc3RydWN0IG5mc19jb21taXRfaW5mbyAqY2luZm8sDQo+ICsJCSAgICBzdHJ1Y3QgaW5v
ZGUgKmlub2RlLA0KPiArCQkgICAgc3RydWN0IG5mc19kaXJlY3RfcmVxICpkcmVxKQ0KPiArew0K
PiArfQ0KPiArRVhQT1JUX1NZTUJPTF9HUEwobmZzX2luaXRfY2luZm8pOw0KPiArDQoNCldlIHNo
b3VsZG4ndCBuZWVkIHRvIGV4cG9ydCB0aGlzLiBUaGVyZSBzaG91bGQgYmUgbm8gc3VibW9kdWxl
cyB3aGVuDQp3ZSdyZSBkb2luZyBORlN2MiBvbmx5Lg0KDQotLSANClRyb25kIE15a2xlYnVzdA0K
TGludXggTkZTIGNsaWVudCBtYWludGFpbmVyDQoNCk5ldEFwcA0KVHJvbmQuTXlrbGVidXN0QG5l
dGFwcC5jb20NCnd3dy5uZXRhcHAuY29tDQoNCg==

2012-04-30 18:30:13

by Anna Schumaker

Subject: Re: [PATCH] NFS: Define dummy nfs_init_cinfo() and nfs_init_cinfo_from_inode()

On 04/30/2012 02:16 PM, Myklebust, Trond wrote:

> On Mon, 2012-04-30 at 13:48 -0400, [email protected] wrote:
>> From: Bryan Schumaker <[email protected]>
>>
>> These are needed when v3 and v4 are not enabled.
>>
>> Signed-off-by: Bryan Schumaker <[email protected]>
>> ---
>> fs/nfs/write.c | 12 ++++++++++++
>> 1 file changed, 12 insertions(+)
>>
>> diff --git a/fs/nfs/write.c b/fs/nfs/write.c
>> index 3636191..f0045e0 100644
>> --- a/fs/nfs/write.c
>> +++ b/fs/nfs/write.c
>> @@ -567,6 +567,18 @@ int nfs_write_need_commit(struct nfs_write_data *data)
>> }
>>
>> #else
>> +static void nfs_init_cinfo_from_inode(struct nfs_commit_info *cinfo,
>> + struct inode *inode)
>> +{
>> +}
>> +
>> +void nfs_init_cinfo(struct nfs_commit_info *cinfo,
>> + struct inode *inode,
>> + struct nfs_direct_req *dreq)
>> +{
>> +}
>> +EXPORT_SYMBOL_GPL(nfs_init_cinfo);
>> +
>
> We shouldn't need to export this. There should be no submodules when
> we're doing NFSv2 only.
>


Right, I saw a missing symbol error and exported it out of habit. I'll resend without the export.

- Bryan