diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-29 11:20:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-29 11:20:02 -0700 |
| commit | f1d1c9fa8f360990e263bdcb73e35ab6fbdc41fe (patch) | |
| tree | 91468535e200f890fd532d5cbb50df59035278e0 /fs/nfs/inode.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus (diff) | |
| parent | SUNRPC: Support for RPC over AF_LOCAL transports (diff) | |
| download | linux-dev-f1d1c9fa8f360990e263bdcb73e35ab6fbdc41fe.tar.xz linux-dev-f1d1c9fa8f360990e263bdcb73e35ab6fbdc41fe.zip | |
Merge branch 'nfs-for-2.6.40' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'nfs-for-2.6.40' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
SUNRPC: Support for RPC over AF_LOCAL transports
SUNRPC: Remove obsolete comment
SUNRPC: Use AF_LOCAL for rpcbind upcalls
SUNRPC: Clean up use of curly braces in switch cases
NFS: Revert NFSROOT default mount options
SUNRPC: Rename xs_encode_tcp_fragment_header()
nfs,rcu: convert call_rcu(nfs_free_delegation_callback) to kfree_rcu()
nfs41: Correct offset for LAYOUTCOMMIT
NFS: nfs_update_inode: print current and new inode size in debug output
NFSv4.1: Fix the handling of NFS4ERR_SEQ_MISORDERED errors
NFSv4: Handle expired stateids when the lease is still valid
SUNRPC: Deal with the lack of a SYN_SENT sk->sk_state_change callback...
Diffstat (limited to 'fs/nfs/inode.c')
| -rw-r--r-- | fs/nfs/inode.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 57bb31ad7a5e..873c6fa8bc3b 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1298,8 +1298,12 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) i_size_write(inode, new_isize); invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA; } - dprintk("NFS: isize change on server for file %s/%ld\n", - inode->i_sb->s_id, inode->i_ino); + dprintk("NFS: isize change on server for file %s/%ld " + "(%Ld to %Ld)\n", + inode->i_sb->s_id, + inode->i_ino, + (long long)cur_isize, + (long long)new_isize); } } else invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR |