diff options
| author | Tejun Heo <tj@kernel.org> | 2009-12-08 16:11:05 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-12-08 16:11:05 +0900 |
| commit | ad0ae0c466faf011b3aea5ce65340fa30ba1f63e (patch) | |
| tree | 03f0212446ec15a074de96955fdaf63c50c838b6 /fs/nfs/nfs4xdr.c | |
| parent | 19b783c5fb5e276c1508b68112468df5c05bbb87 (diff) | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
Merge branch 'master' into for-next
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
| -rw-r--r-- | fs/nfs/nfs4xdr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 83ad47cbdd8a..20b4e30e6c82 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -5681,7 +5681,6 @@ static struct { { NFS4ERR_SERVERFAULT, -ESERVERFAULT }, { NFS4ERR_BADTYPE, -EBADTYPE }, { NFS4ERR_LOCKED, -EAGAIN }, - { NFS4ERR_RESOURCE, -EREMOTEIO }, { NFS4ERR_SYMLINK, -ELOOP }, { NFS4ERR_OP_ILLEGAL, -EOPNOTSUPP }, { NFS4ERR_DEADLOCK, -EDEADLK }, |