OSDN Git Service

ext4: fix ext4 mismerge back in January
authorAl Viro <viro@ZenIV.linux.org.uk>
Mon, 23 Jul 2012 00:27:31 +0000 (20:27 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 23 Jul 2012 00:27:31 +0000 (20:27 -0400)
commit254706056be7e4e161ae9675ead6cd4e269be966
tree12bc0bdb34ac8f908b2746dfbc7ada2eefeccd61
parent3108b54bcedde5d952c90460df5bc21efc1e134f
ext4: fix ext4 mismerge back in January

Duplicate caused, AFAICS, by mismerge in
ff9cb1c4eead5e4c292e75cd3170a82d66944101>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
fs/ext4/ioctl.c